X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-editor-impl.h;h=a3a88547b36ac42a76d274f09963107fcf8594c4;hb=81d8e007ed1aed6e36e4cf44e456d91cf8024004;hp=6fbced99a5a0cc72ebfc10ebbe3bba652c1fb2b3;hpb=50106cc2737496e2b27b2a6d089f205321678a41;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git 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 6fbced9..a3a8854 100644 --- a/dali-toolkit/internal/controls/text-controls/text-editor-impl.h +++ b/dali-toolkit/internal/controls/text-controls/text-editor-impl.h @@ -23,7 +23,6 @@ #include // INTERNAL INCLUDES -#include #include #include #include @@ -97,9 +96,9 @@ public: Toolkit::TextEditor::InputStyleChangedSignalType& InputStyleChangedSignal(); /** - * @copydoc DevelTextEditor::ScrollStateChangedSignal() + * @copydoc TextEditor::ScrollStateChangedSignal() */ - Toolkit::DevelTextEditor::ScrollStateChangedSignalType& ScrollStateChangedSignal(); + Toolkit::TextEditor::ScrollStateChangedSignalType& ScrollStateChangedSignal(); private: // From Control @@ -282,7 +281,7 @@ private: // Data // Signals Toolkit::TextEditor::TextChangedSignalType mTextChangedSignal; Toolkit::TextEditor::InputStyleChangedSignalType mInputStyleChangedSignal; - Toolkit::DevelTextEditor::ScrollStateChangedSignalType mScrollStateChangedSignal; + Toolkit::TextEditor::ScrollStateChangedSignalType mScrollStateChangedSignal; ImfManager mImfManager; Text::ControllerPtr mController; @@ -301,6 +300,7 @@ private: // Data float mAlignmentOffset; float mScrollAnimationDuration; + float mLineSpacing; int mRenderingBackend; bool mHasBeenStaged:1; bool mScrollAnimationEnabled:1;