X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-editor-impl.h;h=f12179930d0fa87d8b5b24398906db9cb04dff73;hb=9c8dde9b9ef1584733943142c17d766d54d28ff0;hp=3c2cec44da19ea139d913ad547f2bd47c50d49ec;hpb=29676ba87bbb4c2c1f511772fb9eb35bb2751cbd;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 3c2cec4..f121799 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; @@ -296,6 +295,7 @@ private: // Data std::vector mClippingDecorationActors; ///< Decoration actors which need clipping. Actor mRenderableActor; + Actor mActiveLayer; CallbackBase* mIdleCallback; float mAlignmentOffset;