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
913d820
..
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
@@
-21,7
+21,8
@@
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
#include <dali-toolkit/public-api/controls/text-controls/text-label.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
#include <dali-toolkit/public-api/controls/text-controls/text-label.h>
-#include <dali-toolkit/public-api/text/text-controller.h>
+#include <dali-toolkit/internal/text/text-controller.h>
+#include <dali-toolkit/internal/text/rendering/text-renderer.h>
namespace Dali
{
namespace Dali
{
@@
-39,27
+40,16
@@
class TextLabel : public Control, public Text::ControlInterface
{
public:
{
public:
- // Properties
- enum
- {
- TEXTLABEL_PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1,
- TEXTLABEL_PROPERTY_END_INDEX = TEXTLABEL_PROPERTY_START_INDEX + 1000 ///< Reserving 1000 property indices
- };
-
/**
* @copydoc Dali::Toollkit::TextLabel::New()
*/
static Toolkit::TextLabel New();
/**
* @copydoc Dali::Toollkit::TextLabel::New()
*/
static Toolkit::TextLabel New();
- /**
- * @copydoc Dali::Toollkit::TextLabel::SetRenderer()
- */
- void SetRenderer( Text::RendererPtr renderer );
-
// Properties
/**
// Properties
/**
- * Called when a property of an object of this type is set.
+ * @brief Called when a property of an object of this type is set.
+ *
* @param[in] object The object whose property is set.
* @param[in] index The property index.
* @param[in] value The new property value.
* @param[in] object The object whose property is set.
* @param[in] index The property index.
* @param[in] value The new property value.
@@
-67,7
+57,8
@@
public:
static void SetProperty( BaseObject* object, Property::Index index, const Property::Value& value );
/**
static void SetProperty( BaseObject* object, Property::Index index, const Property::Value& value );
/**
- * Called to retrieve a property of an object of this type.
+ * @brief Called to retrieve a property of an object of this type.
+ *
* @param[in] object The object whose property is to be retrieved.
* @param[in] index The property index.
* @return The current value of the property.
* @param[in] object The object whose property is to be retrieved.
* @param[in] index The property index.
* @return The current value of the property.
@@
-82,9
+73,14
@@
private: // From Control
virtual void OnInitialize();
/**
virtual void OnInitialize();
/**
- * @copydoc Control::On
Initializ
e()
+ * @copydoc Control::On
StyleChang
e()
*/
*/
- virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );
+ virtual void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change );
+
+ /**
+ * @copydoc Control::OnRelayout()
+ */
+ virtual void OnRelayout( const Vector2& size, RelayoutContainer& container );
/**
* @copydoc Control::GetNaturalSize()
/**
* @copydoc Control::GetNaturalSize()
@@
-97,23
+93,31
@@
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()
+ */
+ virtual void OnStageConnection( int depth );
+
+ /**
* @copydoc Text::ControlInterface::RequestTextRelayout()
*/
virtual void RequestTextRelayout();
* @copydoc Text::ControlInterface::RequestTextRelayout()
*/
virtual void RequestTextRelayout();
-private: // Implementation
-
/**
/**
- * Helper for SetProperty.
- * @param[in] text The new "text" property value.
+ * @copydoc Text::ControlInterface::TextChanged()
*/
*/
- v
oid SetText( const std::string& text
);
+ v
irtual void TextChanged(
);
/**
/**
- * Helper for SetProperty.
- * @param[in] multiLine The new "multi-line" property value.
+ * @copydoc Text::ControlInterface::MaxLengthReached()
*/
*/
- void SetMultiLine( bool multiLine );
+ virtual void MaxLengthReached();
+
+private: // Implementation
/**
* Construct a new TextLabel.
/**
* Construct a new TextLabel.
@@
-131,10
+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;
private: // Data
Text::ControllerPtr mController;
Text::RendererPtr mRenderer;
+ Actor mRenderableActor;
+ int mRenderingBackend;
+ bool mHasBeenStaged:1;
};
} // namespace Internal
};
} // namespace Internal