X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-field-impl.h;h=c574bb86f82a99b637f0879f591b621fc2a67e6d;hp=eb35b4f91c3f08175ed85765b2da2b12fa48f405;hb=7dcd34602d12e17c0fb64cbc0560925878ed87d7;hpb=6a58cf6dc58bc4d8810f545ea700959d59485ae1 diff --git a/dali-toolkit/internal/controls/text-controls/text-field-impl.h b/dali-toolkit/internal/controls/text-controls/text-field-impl.h index eb35b4f..c574bb8 100644 --- a/dali-toolkit/internal/controls/text-controls/text-field-impl.h +++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.h @@ -140,15 +140,22 @@ private: // From Control virtual void OnPan( const PanGesture& gesture ); /** + * @copydoc Control::OnLongPress() + */ + virtual void OnLongPress( const LongPressGesture& gesture ); + + /** * @copydoc Control::OnStageConnection() */ - virtual void OnStageConnection( unsigned int depth ); + virtual void OnStageConnection( int depth ); /** * @copydoc Dali::CustomActorImpl::OnKeyEvent(const KeyEvent&) */ virtual bool OnKeyEvent(const KeyEvent& event); +// From ControlInterface + /** * @copydoc Text::ControlInterface::AddDecoration() */ @@ -169,6 +176,8 @@ private: // From Control */ virtual void MaxLengthReached(); +private: // Implementation + /** * @copydoc Dali::Toolkit::Text::Controller::(ImfManager& imfManager, const ImfManager::ImfEventData& imfEvent) */ @@ -180,7 +189,13 @@ private: // From Control */ void OnClipboardTextSelected( ClipboardEventNotifier& clipboard ); -private: // Implementation + /** + * @brief Get a Property Map for the image used for the required Handle Image + * @param[out] value the returned image property + * @param[in] handleType the type of handle + * @param[in] handleImageType the type of image for the given handleType + */ + void GetHandleImagePropertyValue( Property::Value& value, Text::HandleType handleType, Text::HandleImageType handleImageType ); /** * @brief Enable or disable clipping. @@ -198,12 +213,12 @@ private: // Implementation void KeyboardStatusChanged( bool keyboardShown ); /** - * @brief Callback when Textfield is touched + * @brief Callback when TextField is touched * * @param[in] actor TextField touched - * @param[in] event TouchEvent information + * @param[in] touch Touch information */ - bool OnTouched( Actor actor, const TouchEvent& event ); + bool OnTouched( Actor actor, const TouchData& touch ); /** * Construct a new TextField. @@ -222,7 +237,7 @@ private: // Implementation /** * @brief Render view, create and attach actor(s) to this Text Field. */ - void RenderText(); + void RenderText( Text::Controller::UpdateTextType updateTextType ); // Connection needed to re-render text, when a Text Field returns to the stage. void OnStageConnect( Dali::Actor actor ); @@ -243,7 +258,6 @@ private: // Data int mRenderingBackend; int mExceedPolicy; - unsigned int mDepth; bool mHasBeenStaged:1; };