projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[dali_1.9.3] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
text
/
text-visual.h
diff --git
a/dali-toolkit/internal/visuals/text/text-visual.h
b/dali-toolkit/internal/visuals/text/text-visual.h
index
6fbf8ed
..
6f47e45
100644
(file)
--- a/
dali-toolkit/internal/visuals/text/text-visual.h
+++ b/
dali-toolkit/internal/visuals/text/text-visual.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_INTERNAL_TEXT_VISUAL_H
/*
#define DALI_TOOLKIT_INTERNAL_TEXT_VISUAL_H
/*
- * Copyright (c) 201
7
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
9
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-128,22
+128,22
@@
public: // from Visual::Base
/**
* @copydoc Visual::Base::GetHeightForWidth()
*/
/**
* @copydoc Visual::Base::GetHeightForWidth()
*/
-
virtual float GetHeightForWidth( float width )
;
+
float GetHeightForWidth( float width ) override
;
/**
* @copydoc Visual::Base::GetNaturalSize()
*/
/**
* @copydoc Visual::Base::GetNaturalSize()
*/
- v
irtual void GetNaturalSize( Vector2& naturalSize )
;
+ v
oid GetNaturalSize( Vector2& naturalSize ) override
;
/**
* @copydoc Visual::Base::CreatePropertyMap()
*/
/**
* @copydoc Visual::Base::CreatePropertyMap()
*/
- v
irtual void DoCreatePropertyMap( Property::Map& map ) const
;
+ v
oid DoCreatePropertyMap( Property::Map& map ) const override
;
/**
* @copydoc Visual::Base::CreateInstancePropertyMap
*/
/**
* @copydoc Visual::Base::CreateInstancePropertyMap
*/
- v
irtual void DoCreateInstancePropertyMap( Property::Map& map ) const
;
+ v
oid DoCreateInstancePropertyMap( Property::Map& map ) const override
;
protected:
protected:
@@
-164,22
+164,22
@@
protected:
/**
* @copydoc Visual::Base::DoSetProperties()
*/
/**
* @copydoc Visual::Base::DoSetProperties()
*/
- v
irtual void DoSetProperties( const Property::Map& propertyMap )
;
+ v
oid DoSetProperties( const Property::Map& propertyMap ) override
;
/**
* @copydoc Visual::Base::DoSetOnStage()
*/
/**
* @copydoc Visual::Base::DoSetOnStage()
*/
- v
irtual void DoSetOnStage( Actor& actor )
;
+ v
oid DoSetOnStage( Actor& actor ) override
;
/**
* @copydoc Visual::Base::DoSetOffStage()
*/
/**
* @copydoc Visual::Base::DoSetOffStage()
*/
- v
irtual void DoSetOffStage( Actor& actor )
;
+ v
oid DoSetOffStage( Actor& actor ) override
;
/**
* @copydoc Visual::Base::OnSetTransform
*/
/**
* @copydoc Visual::Base::OnSetTransform
*/
- v
irtual void OnSetTransform()
;
+ v
oid OnSetTransform() override
;
private:
/**
private:
/**
@@
-220,13
+220,13
@@
private:
Shader GetTextShader( VisualFactoryCache& factoryCache, bool hasMultipleTextColors, bool containsColorGlyph, bool styleEnabled );
/**
Shader GetTextShader( VisualFactoryCache& factoryCache, bool hasMultipleTextColors, bool containsColorGlyph, bool styleEnabled );
/**
- * @brief Retrieve the
text's controller
.
- * @param[in] visual
The text visual.
- * @return The
text controller
+ * @brief Retrieve the
TextVisual object
.
+ * @param[in] visual
A handle to the TextVisual
+ * @return The
TextVisual object
*/
static TextVisual& GetVisualObject( Toolkit::Visual::Base visual )
{
*/
static TextVisual& GetVisualObject( Toolkit::Visual::Base visual )
{
- return static_cast<
TextVisual&>( visual.GetBase
Object() );
+ return static_cast<
TextVisual& >( Toolkit::GetImplementation( visual ).GetVisual
Object() );
};
private:
};
private: