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 "Changes required after WeakHandle moved to Public API in Core" into devel...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
text-controls
/
text-editor-impl.h
diff --git
a/dali-toolkit/internal/controls/text-controls/text-editor-impl.h
b/dali-toolkit/internal/controls/text-controls/text-editor-impl.h
index
cc864f1
..
6fbced9
100644
(file)
--- a/
dali-toolkit/internal/controls/text-controls/text-editor-impl.h
+++ b/
dali-toolkit/internal/controls/text-controls/text-editor-impl.h
@@
-23,6
+23,7
@@
#include <dali/public-api/animation/animation.h>
// INTERNAL INCLUDES
#include <dali/public-api/animation/animation.h>
// INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h>
#include <dali-toolkit/public-api/controls/control-impl.h>
#include <dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h>
#include <dali-toolkit/public-api/controls/text-controls/text-editor.h>
#include <dali-toolkit/public-api/controls/control-impl.h>
#include <dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h>
#include <dali-toolkit/public-api/controls/text-controls/text-editor.h>
@@
-95,6
+96,11
@@
public:
*/
Toolkit::TextEditor::InputStyleChangedSignalType& InputStyleChangedSignal();
*/
Toolkit::TextEditor::InputStyleChangedSignalType& InputStyleChangedSignal();
+ /**
+ * @copydoc DevelTextEditor::ScrollStateChangedSignal()
+ */
+ Toolkit::DevelTextEditor::ScrollStateChangedSignalType& ScrollStateChangedSignal();
+
private: // From Control
/**
private: // From Control
/**
@@
-244,6
+250,13
@@
private: // Implementation
void ApplyScrollPosition();
/**
void ApplyScrollPosition();
/**
+ * @brief Callback function for ScrollBar indicator animation finished signal
+ *
+ * Emit ScrollBarStateChanged Signal and toggle mScrollStarted flag to false
+ */
+ void OnScrollIndicatorAnimationFinished( Animation& animation );
+
+ /**
* Construct a new TextEditor.
*/
TextEditor();
* Construct a new TextEditor.
*/
TextEditor();
@@
-269,6
+282,7
@@
private: // Data
// Signals
Toolkit::TextEditor::TextChangedSignalType mTextChangedSignal;
Toolkit::TextEditor::InputStyleChangedSignalType mInputStyleChangedSignal;
// Signals
Toolkit::TextEditor::TextChangedSignalType mTextChangedSignal;
Toolkit::TextEditor::InputStyleChangedSignalType mInputStyleChangedSignal;
+ Toolkit::DevelTextEditor::ScrollStateChangedSignalType mScrollStateChangedSignal;
ImfManager mImfManager;
Text::ControllerPtr mController;
ImfManager mImfManager;
Text::ControllerPtr mController;
@@
-282,6
+296,7
@@
private: // Data
std::vector<Actor> mClippingDecorationActors; ///< Decoration actors which need clipping.
Actor mRenderableActor;
std::vector<Actor> mClippingDecorationActors; ///< Decoration actors which need clipping.
Actor mRenderableActor;
+ Actor mActiveLayer;
CallbackBase* mIdleCallback;
float mAlignmentOffset;
CallbackBase* mIdleCallback;
float mAlignmentOffset;
@@
-290,6
+305,7
@@
private: // Data
bool mHasBeenStaged:1;
bool mScrollAnimationEnabled:1;
bool mScrollBarEnabled:1;
bool mHasBeenStaged:1;
bool mScrollAnimationEnabled:1;
bool mScrollBarEnabled:1;
+ bool mScrollStarted:1;
};
} // namespace Internal
};
} // namespace Internal