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
Rename OnStage signals and related internal changes
[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
old mode 100644
(file)
new mode 100755
(executable)
index
cc864f1
..
1c3c9b8
--- a/
dali-toolkit/internal/controls/text-controls/text-editor-impl.h
+++ b/
dali-toolkit/internal/controls/text-controls/text-editor-impl.h
@@
-20,11
+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/devel-api/adaptor-framework/input-method-context.h>
#include <dali/public-api/animation/animation.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
#include <dali/public-api/animation/animation.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/
public
-api/controls/scroll-bar/scroll-bar.h>
+#include <dali-toolkit/
devel
-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>
@@
-41,7
+42,6
@@
namespace Toolkit
namespace Internal
{
namespace Internal
{
-
/**
* @brief A control which renders a long text string with styles.
*/
/**
* @brief A control which renders a long text string with styles.
*/
@@
-75,6
+75,11
@@
public:
static Property::Value GetProperty( BaseObject* object, Property::Index index );
/**
static Property::Value GetProperty( BaseObject* object, Property::Index index );
/**
+ * @copydoc Dali::Toollkit::TextEditor::GetInputMethodContext()
+ */
+ InputMethodContext GetInputMethodContext();
+
+ /**
* Connects a callback function with the object's signals.
* @param[in] object The object providing the signal.
* @param[in] tracker Used to disconnect the signal.
* Connects a callback function with the object's signals.
* @param[in] object The object providing the signal.
* @param[in] tracker Used to disconnect the signal.
@@
-95,6
+100,11
@@
public:
*/
Toolkit::TextEditor::InputStyleChangedSignalType& InputStyleChangedSignal();
*/
Toolkit::TextEditor::InputStyleChangedSignalType& InputStyleChangedSignal();
+ /**
+ * @copydoc TextEditor::ScrollStateChangedSignal()
+ */
+ Toolkit::TextEditor::ScrollStateChangedSignalType& ScrollStateChangedSignal();
+
private: // From Control
/**
private: // From Control
/**
@@
-148,9
+158,9
@@
private: // From Control
virtual void OnLongPress( const LongPressGesture& gesture );
/**
virtual void OnLongPress( const LongPressGesture& gesture );
/**
- * @copydoc Control::OnS
tag
eConnection()
+ * @copydoc Control::OnS
cen
eConnection()
*/
*/
- virtual void OnS
tag
eConnection( int depth );
+ virtual void OnS
cen
eConnection( int depth );
/**
* @copydoc Dali::CustomActorImpl::OnKeyEvent(const KeyEvent&)
/**
* @copydoc Dali::CustomActorImpl::OnKeyEvent(const KeyEvent&)
@@
-189,9
+199,9
@@
private: // From Control
private: // Implementation
/**
private: // Implementation
/**
- * @copydoc Dali::Toolkit::Text::Controller::(I
mfManager& imfManager, const ImfManager::ImfEventData& imf
Event)
+ * @copydoc Dali::Toolkit::Text::Controller::(I
nputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContext
Event)
*/
*/
- I
mfManager::ImfCallbackData OnImfEvent( ImfManager& imfManager, const ImfManager::ImfEventData& imf
Event );
+ I
nputMethodContext::CallbackData OnInputMethodContextEvent( InputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContext
Event );
/**
* @brief Callback when Clipboard signals an item should be pasted
/**
* @brief Callback when Clipboard signals an item should be pasted
@@
-244,6
+254,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();
@@
-262,15
+279,16
@@
private: // Implementation
*/
void RenderText( Text::Controller::UpdateTextType updateTextType );
*/
void RenderText( Text::Controller::UpdateTextType updateTextType );
- // Connection needed to re-render text, when a text editor returns to the s
tag
e.
- void OnS
tag
eConnect( Dali::Actor actor );
+ // Connection needed to re-render text, when a text editor returns to the s
cen
e.
+ void OnS
cen
eConnect( Dali::Actor actor );
private: // Data
// Signals
Toolkit::TextEditor::TextChangedSignalType mTextChangedSignal;
Toolkit::TextEditor::InputStyleChangedSignalType mInputStyleChangedSignal;
private: // Data
// Signals
Toolkit::TextEditor::TextChangedSignalType mTextChangedSignal;
Toolkit::TextEditor::InputStyleChangedSignalType mInputStyleChangedSignal;
+ Toolkit::TextEditor::ScrollStateChangedSignalType mScrollStateChangedSignal;
- I
mfManager mImfManager
;
+ I
nputMethodContext mInputMethodContext
;
Text::ControllerPtr mController;
Text::RendererPtr mRenderer;
Text::DecoratorPtr mDecorator;
Text::ControllerPtr mController;
Text::RendererPtr mRenderer;
Text::DecoratorPtr mDecorator;
@@
-282,14
+300,17
@@
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;
float mScrollAnimationDuration;
CallbackBase* mIdleCallback;
float mAlignmentOffset;
float mScrollAnimationDuration;
+ float mLineSpacing;
int mRenderingBackend;
bool mHasBeenStaged:1;
bool mScrollAnimationEnabled:1;
bool mScrollBarEnabled:1;
int mRenderingBackend;
bool mHasBeenStaged:1;
bool mScrollAnimationEnabled:1;
bool mScrollBarEnabled:1;
+ bool mScrollStarted:1;
};
} // namespace Internal
};
} // namespace Internal