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 "Added code for stylable transitions" 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
b0c2232
..
bdc587d
100644
(file)
--- a/
dali-toolkit/internal/controls/text-controls/text-label-impl.h
+++ b/
dali-toolkit/internal/controls/text-controls/text-label-impl.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_INTERNAL_TEXT_LABEL_H__
-#define
__DALI_TOOLKIT_INTERNAL_TEXT_LABEL_H__
+#ifndef
DALI_TOOLKIT_INTERNAL_TEXT_LABEL_H
+#define
DALI_TOOLKIT_INTERNAL_TEXT_LABEL_H
/*
/*
- * Copyright (c) 201
5
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
6
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.
@@
-21,8
+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/internal/text/text-control
ler
.h>
-#include <dali-toolkit/internal/
text/rendering/text-renderer
.h>
+#include <dali-toolkit/internal/text/text-control
-interface
.h>
+#include <dali-toolkit/internal/
visuals/text/text-visual
.h>
namespace Dali
{
namespace Dali
{
@@
-40,13
+40,6
@@
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()
*/
/**
* @copydoc Dali::Toollkit::TextLabel::New()
*/
@@
-55,7
+48,8
@@
public:
// 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.
@@
-63,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.
@@
-78,9
+73,14
@@
private: // From Control
virtual void OnInitialize();
/**
virtual void OnInitialize();
/**
- * @copydoc Control::OnInitialize()
+ * @copydoc Control::OnStyleChange()
+ */
+ virtual void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change );
+
+ /**
+ * @copydoc Control::OnRelayout()
*/
*/
- virtual void OnRelayout( const Vector2& size,
ActorSize
Container& container );
+ virtual void OnRelayout( const Vector2& size,
Relayout
Container& container );
/**
* @copydoc Control::GetNaturalSize()
/**
* @copydoc Control::GetNaturalSize()
@@
-93,6
+93,13
@@
private: // From Control
virtual float GetHeightForWidth( float width );
/**
virtual float GetHeightForWidth( float width );
/**
+ * @copydoc Control::OnStageConnection()
+ */
+ virtual void OnStageConnection( int depth );
+
+// From ControlInterface
+
+ /**
* @copydoc Text::ControlInterface::RequestTextRelayout()
*/
virtual void RequestTextRelayout();
* @copydoc Text::ControlInterface::RequestTextRelayout()
*/
virtual void RequestTextRelayout();
@@
-117,10
+124,7
@@
private:
private: // Data
private: // Data
- Text::ControllerPtr mController;
- Text::RendererPtr mRenderer;
-
- unsigned int mRenderingBackend;
+ Toolkit::Visual::Base mVisual;
};
} // namespace Internal
};
} // namespace Internal
@@
-149,4
+153,4
@@
inline const Toolkit::Internal::TextLabel& GetImpl( const Toolkit::TextLabel& te
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_TOOLKIT_INTERNAL_TEXT_LABEL_H__
+#endif //
DALI_TOOLKIT_INTERNAL_TEXT_LABEL_H