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
Added ScrollStateChangedSignal to TextEditor.
[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
40f5e03
..
3c2cec4
100644
(file)
--- a/
dali-toolkit/internal/controls/text-controls/text-editor-impl.h
+++ b/
dali-toolkit/internal/controls/text-controls/text-editor-impl.h
@@
-20,9
+20,12
@@
// EXTERNAL INCLUDES
#include <dali/devel-api/adaptor-framework/clipboard-event-notifier.h>
// EXTERNAL INCLUDES
#include <dali/devel-api/adaptor-framework/clipboard-event-notifier.h>
+#include <dali/public-api/animation/animation.h>
// INTERNAL INCLUDES
// 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/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/internal/text/decorator/text-decorator.h>
#include <dali-toolkit/internal/text/text-control-interface.h>
#include <dali-toolkit/public-api/controls/text-controls/text-editor.h>
#include <dali-toolkit/internal/text/decorator/text-decorator.h>
#include <dali-toolkit/internal/text/text-control-interface.h>
@@
-93,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
/**
@@
-213,6
+221,13
@@
private: // Implementation
void KeyboardStatusChanged( bool keyboardShown );
/**
void KeyboardStatusChanged( bool keyboardShown );
/**
+ * @brief update scroll bar position
+ *
+ * If text scroll is occurred, create or update scroll bar position
+ */
+ void UpdateScrollBar();
+
+ /**
* @brief Callback when TextEditor is touched
*
* @param[in] actor TextEditor touched
* @brief Callback when TextEditor is touched
*
* @param[in] actor TextEditor touched
@@
-235,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();
@@
-257,10
+279,10
@@
private: // Implementation
void OnStageConnect( Dali::Actor actor );
private: // Data
void OnStageConnect( Dali::Actor actor );
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;
@@
-268,6
+290,9
@@
private: // Data
Text::DecoratorPtr mDecorator;
Text::TextVerticalScrollerPtr mTextVerticalScroller;
Toolkit::Control mStencil;
Text::DecoratorPtr mDecorator;
Text::TextVerticalScrollerPtr mTextVerticalScroller;
Toolkit::Control mStencil;
+ Toolkit::ScrollBar mScrollBar;
+ Dali::Animation mAnimation; ///< Scroll indicator Show/Hide Animation.
+ Dali::TimePeriod mAnimationPeriod;
std::vector<Actor> mClippingDecorationActors; ///< Decoration actors which need clipping.
Actor mRenderableActor;
std::vector<Actor> mClippingDecorationActors; ///< Decoration actors which need clipping.
Actor mRenderableActor;
@@
-278,6
+303,8
@@
private: // Data
int mRenderingBackend;
bool mHasBeenStaged:1;
bool mScrollAnimationEnabled:1;
int mRenderingBackend;
bool mHasBeenStaged:1;
bool mScrollAnimationEnabled:1;
+ bool mScrollBarEnabled:1;
+ bool mScrollStarted:1;
};
} // namespace Internal
};
} // namespace Internal