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
Fix for Text Selection issues.
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
decorator
/
text-decorator.h
diff --git
a/dali-toolkit/internal/text/decorator/text-decorator.h
b/dali-toolkit/internal/text/decorator/text-decorator.h
index
29d1631
..
f38c467
100644
(file)
--- a/
dali-toolkit/internal/text/decorator/text-decorator.h
+++ b/
dali-toolkit/internal/text/decorator/text-decorator.h
@@
-38,6
+38,8
@@
class Vector4;
namespace Toolkit
{
namespace Toolkit
{
+class TextSelectionPopupCallbackInterface;
+
namespace Internal
{
class Control;
namespace Internal
{
class Control;
@@
-152,9
+154,12
@@
public:
* @brief Create a new instance of a Decorator.
*
* @param[in] controller The controller which receives input events from Decorator components.
* @brief Create a new instance of a Decorator.
*
* @param[in] controller The controller which receives input events from Decorator components.
+ * @param[in] callbackInterface The text popup callback interface which receives the button click callbacks.
+ *
* @return A pointer to a new Decorator.
*/
* @return A pointer to a new Decorator.
*/
- static DecoratorPtr New( ControllerInterface& controller );
+ static DecoratorPtr New( ControllerInterface& controller,
+ TextSelectionPopupCallbackInterface& callbackInterface );
/**
* @brief Set the bounding box which handles, popup and similar decorations will not exceed.
/**
* @brief Set the bounding box which handles, popup and similar decorations will not exceed.
@@
-462,18
+467,9
@@
public:
float GetScrollSpeed() const;
/**
float GetScrollSpeed() const;
/**
- * @brief Sets the scroll interval.
- *
- * @param[in] seconds The scroll interval in seconds.
- */
- void SetScrollTickInterval( float seconds );
-
- /**
- * @brief Retrieves the scroll interval.
- *
- * @return The scroll interval.
+ * @brief Notifies the decorator the whole text has been scrolled.
*/
*/
-
float GetScrollTickInterval() const
;
+
void NotifyEndOfScroll()
;
protected:
protected:
@@
-487,8
+483,10
@@
private:
/**
* @brief Private constructor.
* @param[in] controller The controller which receives input events from Decorator components.
/**
* @brief Private constructor.
* @param[in] controller The controller which receives input events from Decorator components.
+ * @param[in] callbackInterface The text popup callback interface which receives the button click callbacks.
*/
*/
- Decorator( ControllerInterface& controller );
+ Decorator( ControllerInterface& controller,
+ TextSelectionPopupCallbackInterface& callbackInterface );
// Undefined
Decorator( const Decorator& handle );
// Undefined
Decorator( const Decorator& handle );