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
Adjust point size for 1920x1080
[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
5c62137
..
85e94ab
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
7
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.
@@
-18,11
+18,19
@@
*
*/
*
*/
+// EXTERNAL INCLUDES
+#include <dali/public-api/object/property-map.h>
+
// 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-interface.h>
#include <dali-toolkit/internal/text/text-controller.h>
#include <dali-toolkit/internal/text/text-controller.h>
+#include <dali-toolkit/internal/text/text-scroller-interface.h>
#include <dali-toolkit/internal/text/rendering/text-renderer.h>
#include <dali-toolkit/internal/text/rendering/text-renderer.h>
+#include <dali-toolkit/internal/text/text-scroller.h>
+#include <dali-toolkit/internal/visuals/text/text-visual.h>
+
namespace Dali
{
namespace Dali
{
@@
-36,17
+44,10
@@
namespace Internal
/**
* @brief A control which renders a short text string.
*/
/**
* @brief A control which renders a short text string.
*/
-class TextLabel : public Control, public Text::ControlInterface
+class TextLabel : public Control, public Text::ControlInterface
, public Text::ScrollerInterface
{
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
+56,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
+65,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.
@@
-75,27
+78,46
@@
private: // From Control
/**
* @copydoc Control::OnInitialize()
*/
/**
* @copydoc Control::OnInitialize()
*/
- virtual void OnInitialize();
+ virtual void OnInitialize()
override
;
/**
/**
- * @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 ) override ;
+
+ /**
+ * @copydoc Control::OnRelayout()
+ */
+ virtual void OnRelayout( const Vector2& size, RelayoutContainer& container ) override ;
/**
* @copydoc Control::GetNaturalSize()
*/
/**
* @copydoc Control::GetNaturalSize()
*/
- virtual Vector3 GetNaturalSize();
+ virtual Vector3 GetNaturalSize()
override
;
/**
* @copydoc Control::GetHeightForWidth()
*/
/**
* @copydoc Control::GetHeightForWidth()
*/
- virtual float GetHeightForWidth( float width );
+ virtual float GetHeightForWidth( float width ) override ;
+
+ /**
+ * @copydoc Control::OnPropertySet()
+ */
+ virtual void OnPropertySet( Property::Index index, Property::Value propertyValue ) override ;
+
+ // From ControlInterface
/**
* @copydoc Text::ControlInterface::RequestTextRelayout()
*/
/**
* @copydoc Text::ControlInterface::RequestTextRelayout()
*/
- virtual void RequestTextRelayout();
+ virtual void RequestTextRelayout() override ;
+
+private: // from TextScroller
+
+ /**
+ * @copydoc Text::ScrollerInterface::ScrollingFinished()
+ */
+ virtual void ScrollingFinished();
private: // Implementation
private: // Implementation
@@
-115,13
+137,20
@@
private:
TextLabel(const TextLabel&);
TextLabel& operator=(const TextLabel& rhs);
TextLabel(const TextLabel&);
TextLabel& operator=(const TextLabel& rhs);
+ /**
+ * @brief Set up Autoscrolling
+ */
+ void SetUpAutoScrolling();
+
private: // Data
Text::ControllerPtr mController;
private: // Data
Text::ControllerPtr mController;
- Text::RendererPtr mRenderer;
- RenderableActor mRenderableActor;
+ Text::TextScrollerPtr mTextScroller;
+
+ Toolkit::Visual::Base mVisual;
- unsigned int mRenderingBackend;
+ int mRenderingBackend;
+ bool mTextUpdateNeeded:1;
};
} // namespace Internal
};
} // namespace Internal
@@
-150,4
+179,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