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
Added new properties to make ScrollView more scriptable
[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
87ca9f8
..
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()
@@
-130,13
+135,21
@@
private:
TextLabel(const TextLabel&);
TextLabel& operator=(const TextLabel& rhs);
TextLabel(const TextLabel&);
TextLabel& operator=(const TextLabel& rhs);
+ // Connection needed to re-render text, when a Text Label returns to the stage
+ void OnStageConnect( Dali::Actor actor );
+
+ /**
+ * @brief Render view, create and attach actor(s) to this Text Label
+ */
+ void RenderText();
+
private: // Data
Text::ControllerPtr mController;
Text::RendererPtr mRenderer;
Actor mRenderableActor;
int mRenderingBackend;
private: // Data
Text::ControllerPtr mController;
Text::RendererPtr mRenderer;
Actor mRenderableActor;
int mRenderingBackend;
-
unsigned int mDepth
;
+
bool mHasBeenStaged:1
;
};
} // namespace Internal
};
} // namespace Internal