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
Merge "System font family change to update font in TextField" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
text-controls
/
text-label-impl.h
diff --git
a/dali-toolkit/internal/controls/text-controls/text-label-impl.h
b/dali-toolkit/internal/controls/text-controls/text-label-impl.h
index
37e531c
..
ae88beb
100644
(file)
--- a/
dali-toolkit/internal/controls/text-controls/text-label-impl.h
+++ b/
dali-toolkit/internal/controls/text-controls/text-label-impl.h
@@
-93,9
+93,14
@@
private: // From Control
virtual float GetHeightForWidth( float width );
/**
virtual float GetHeightForWidth( float width );
/**
+ * @copydoc Text::ControlInterface::AddDecoration()
+ */
+ virtual void AddDecoration( Actor& actor, bool needsClipping );
+
+ /**
* @copydoc Control::OnStageConnection()
*/
* @copydoc Control::OnStageConnection()
*/
- virtual void OnStageConnection(
unsigned
int depth );
+ virtual void OnStageConnection( int depth );
/**
* @copydoc Text::ControlInterface::RequestTextRelayout()
/**
* @copydoc Text::ControlInterface::RequestTextRelayout()
@@
-144,7
+149,6
@@
private: // Data
Text::RendererPtr mRenderer;
Actor mRenderableActor;
int mRenderingBackend;
Text::RendererPtr mRenderer;
Actor mRenderableActor;
int mRenderingBackend;
- unsigned int mDepth;
bool mHasBeenStaged:1;
};
bool mHasBeenStaged:1;
};