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 "Add Visual descriptions to generate doxygen page" into devel/master
[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
cb40406
..
09465a8
100644
(file)
--- a/
dali-toolkit/internal/controls/text-controls/text-editor-impl.h
+++ b/
dali-toolkit/internal/controls/text-controls/text-editor-impl.h
@@
-1,5
+1,5
@@
-#ifndef
__DALI_TOOLKIT_INTERNAL_TEXT_EDITOR_H__
-#define
__DALI_TOOLKIT_INTERNAL_TEXT_EDITOR_H__
+#ifndef
DALI_TOOLKIT_INTERNAL_TEXT_EDITOR_H
+#define
DALI_TOOLKIT_INTERNAL_TEXT_EDITOR_H
/*
* Copyright (c) 2016 Samsung Electronics Co., Ltd.
/*
* Copyright (c) 2016 Samsung Electronics Co., Ltd.
@@
-18,18
+18,19
@@
*
*/
*
*/
+// EXTERNAL INCLUDES
+#include <dali/devel-api/adaptor-framework/clipboard-event-notifier.h>
+
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
#include <dali-toolkit/public-api/controls/text-controls/text-editor.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
#include <dali-toolkit/public-api/controls/text-controls/text-editor.h>
-#include <dali-toolkit/internal/text/clipping/text-clipper.h>
#include <dali-toolkit/internal/text/decorator/text-decorator.h>
#include <dali-toolkit/internal/text/text-control-interface.h>
#include <dali-toolkit/internal/text/decorator/text-decorator.h>
#include <dali-toolkit/internal/text/text-control-interface.h>
+#include <dali-toolkit/internal/text/text-editable-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-vertical-scroller.h>
#include <dali-toolkit/internal/text/rendering/text-renderer.h>
#include <dali-toolkit/internal/text/rendering/text-renderer.h>
-// EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/clipboard-event-notifier.h>
-
namespace Dali
{
namespace Dali
{
@@
-42,7
+43,7
@@
namespace Internal
/**
* @brief A control which renders a long text string with styles.
*/
/**
* @brief A control which renders a long text string with styles.
*/
-class TextEditor : public Control, public Text::ControlInterface
+class TextEditor : public Control, public Text::ControlInterface
, public Text::EditableControlInterface
{
public:
{
public:
@@
-157,15
+158,12
@@
private: // From Control
// From ControlInterface
/**
// From ControlInterface
/**
- * @copydoc Text::ControlInterface::AddDecoration()
- */
- virtual void AddDecoration( Actor& actor, bool needsClipping );
-
- /**
* @copydoc Text::ControlInterface::RequestTextRelayout()
*/
virtual void RequestTextRelayout();
* @copydoc Text::ControlInterface::RequestTextRelayout()
*/
virtual void RequestTextRelayout();
+// From EditableControlInterface
+
/**
* @copydoc Text::ControlInterface::TextChanged()
*/
/**
* @copydoc Text::ControlInterface::TextChanged()
*/
@@
-181,6
+179,11
@@
private: // From Control
*/
virtual void InputStyleChanged( Text::InputStyle::Mask inputStyleMask );
*/
virtual void InputStyleChanged( Text::InputStyle::Mask inputStyleMask );
+ /**
+ * @copydoc Text::ControlInterface::AddDecoration()
+ */
+ virtual void AddDecoration( Actor& actor, bool needsClipping );
+
private: // Implementation
/**
private: // Implementation
/**
@@
-203,14
+206,6
@@
private: // Implementation
void GetHandleImagePropertyValue( Property::Value& value, Text::HandleType handleType, Text::HandleImageType handleImageType );
/**
void GetHandleImagePropertyValue( Property::Value& value, Text::HandleType handleType, Text::HandleImageType handleImageType );
/**
- * @brief Enable or disable clipping.
- *
- * @param[in] clipping True if clipping should be enabled.
- * @param[in] size The area to clip within.
- */
- void EnableClipping( bool clipping, const Vector2& size );
-
- /**
* @brief Callback when keyboard is shown/hidden.
*
* @param[in] keyboardShown True if keyboard is shown.
* @brief Callback when keyboard is shown/hidden.
*
* @param[in] keyboardShown True if keyboard is shown.
@@
-233,6
+228,13
@@
private: // Implementation
void OnIdleSignal();
/**
void OnIdleSignal();
/**
+ * @brief set RenderActor's position with new scrollPosition
+ *
+ * Apply updated scroll position or start scroll animation if VerticalScrollAnimation is enabled
+ */
+ void ApplyScrollPosition();
+
+ /**
* Construct a new TextEditor.
*/
TextEditor();
* Construct a new TextEditor.
*/
TextEditor();
@@
-263,14
+265,18
@@
private: // Data
Text::ControllerPtr mController;
Text::RendererPtr mRenderer;
Text::DecoratorPtr mDecorator;
Text::ControllerPtr mController;
Text::RendererPtr mRenderer;
Text::DecoratorPtr mDecorator;
- Text::ClipperPtr mClipper;
+ Text::TextVerticalScrollerPtr mTextVerticalScroller;
+ Toolkit::Control mStencil;
std::vector<Actor> mClippingDecorationActors; ///< Decoration actors which need clipping.
Actor mRenderableActor;
CallbackBase* mIdleCallback;
std::vector<Actor> mClippingDecorationActors; ///< Decoration actors which need clipping.
Actor mRenderableActor;
CallbackBase* mIdleCallback;
+ float mAlignmentOffset;
+ float mScrollAnimationDuration;
int mRenderingBackend;
bool mHasBeenStaged:1;
int mRenderingBackend;
bool mHasBeenStaged:1;
+ bool mScrollAnimationEnabled:1;
};
} // namespace Internal
};
} // namespace Internal
@@
-299,4
+305,4
@@
inline const Toolkit::Internal::TextEditor& GetImpl( const Toolkit::TextEditor&
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_TOOLKIT_INTERNAL_TEXT_EDITOR_H__
+#endif //
DALI_TOOLKIT_INTERNAL_TEXT_EDITOR_H