From c78def0f95a7698d6737154e5c2dbb9df454958f Mon Sep 17 00:00:00 2001 From: Agnelo Vaz Date: Thu, 27 Feb 2014 12:19:23 +0000 Subject: [PATCH] (TextInput) Removing deprecated Margin and Handle flip API [Issue#] N/A [Problem] N/A [Cause] N/A [Solution] Removing: /* @deprecated, use SetBoundingRectangle instead. */ void SetSelectionHandleFlipMargin( const Vector4& margin ); /* @deprecated, use GetBoundingRectangle instead. */ const Vector4& GetSelectionHandleFlipMargin(); /* @deprecated, handles always flip. Use SetBoundingRectangle */ void EnableSelectionHandleFlip( bool toggle ); /* @deprecated, handles always flip. Use SetBoundingRectangle */ bool IsSelectionHandleFlipEnabled(); [Verification] Build Repo --- .../public-api/controls/text-input/text-input.h | 37 ---------------------- .../public-api/controls/text-input/text-input.cpp | 20 ------------ 2 files changed, 57 deletions(-) diff --git a/capi/dali-toolkit/public-api/controls/text-input/text-input.h b/capi/dali-toolkit/public-api/controls/text-input/text-input.h index da7c8cc..d52b041 100644 --- a/capi/dali-toolkit/public-api/controls/text-input/text-input.h +++ b/capi/dali-toolkit/public-api/controls/text-input/text-input.h @@ -271,36 +271,6 @@ public: bool IsGrabHandleEnabled(); /** - * Toggle to enable flipping the selection handle, when it is reached the selection handle flip border. - * @param[in] toggle true to enable, false to disable flipping the selection handle. DEFAULT = true. - */ - /* @deprecated, handles always flip. Use SetBoundingRectangle */ - void EnableSelectionHandleFlip( bool toggle ); - - /** - * Method to check if the selection handle flip is enabled, if true then the selection cursor will be fliped when this exceed border. - * @return bool return true is that the selection handle flip enable. - */ - /* @deprecated, handles always flip. Use SetBoundingRectangle */ - bool IsSelectionHandleFlipEnabled(); - - /** - * Set the selection handle filp margin. - * The default value is Vector4(0, 0, 0, 0) - * ------------------------------------------ - * | y | - * | ---------------------------------- | - * | | | | - * | x | Text Input | z | - * | | | | - * | ---------------------------------- | - * | w | - * ------------------------------------------ - */ - /* @deprecated, use SetBoundingRectangle instead. */ - void SetSelectionHandleFlipMargin( const Vector4& margin ); - - /** * Set the bounding rectangle which handles, popup and similar decorations will not exceed * The default value is the width and height of the stage from the top left origin. * If a title bar for example is on the top of the screen then the y should be the title's height and @@ -326,13 +296,6 @@ public: */ const Rect GetBoundingRectangle() const; - /** - * Retrieve the selection handle filp margin. - * @return Vector4 the selection handle flip margin. - */ - /* @deprecated, use GetBoundingRectangle instead. */ - const Vector4& GetSelectionHandleFlipMargin(); - /** * Sets the style for new text being typed. * By default all style settings are applied but a bit mask could be used to modify only certain style settings. diff --git a/dali-toolkit/public-api/controls/text-input/text-input.cpp b/dali-toolkit/public-api/controls/text-input/text-input.cpp index 685a5dd..2914a1b 100644 --- a/dali-toolkit/public-api/controls/text-input/text-input.cpp +++ b/dali-toolkit/public-api/controls/text-input/text-input.cpp @@ -193,21 +193,6 @@ bool TextInput::IsGrabHandleEnabled() return GetImpl(*this).IsGrabHandleEnabled(); } -void TextInput::EnableSelectionHandleFlip( bool toggle ) -{ - GetImpl(*this).EnableSelectionHandleFlip( toggle ); -} - -bool TextInput::IsSelectionHandleFlipEnabled() -{ - return GetImpl(*this).IsSelectionHandleFlipEnabled(); -} - -void TextInput::SetSelectionHandleFlipMargin( const Vector4& border ) -{ - GetImpl(*this).SetSelectionHandleFlipMargin( border ); -} - void TextInput::SetBoundingRectangle( const Rect& boundingOriginAndSize ) { GetImpl(*this).SetBoundingRectangle( boundingOriginAndSize ); @@ -218,11 +203,6 @@ const Rect TextInput::GetBoundingRectangle() const return GetImpl(*this).GetBoundingRectangle(); } -const Vector4& TextInput::GetSelectionHandleFlipMargin() -{ - return GetImpl(*this).GetSelectionHandleFlipMargin(); -} - void TextInput::SetActiveStyle( const TextStyle& style, const TextStyle::Mask mask ) { GetImpl(*this).SetActiveStyle(style,mask); -- 2.7.4