From: Heeyong Song Date: Tue, 4 Jul 2017 01:36:05 +0000 (+0900) Subject: Fix a popup position error caused by SetInheritPosition() change X-Git-Tag: dali_1.2.47~2 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=ae59f2ed1fd067050fb57465b9623160d995e02e;hp=f041e9c5f60d1b5126278c673191629a21c7fa49;ds=sidebyside Fix a popup position error caused by SetInheritPosition() change Change-Id: I26e9a223a214111a6ae3d7f30fc2d79342b4b189 --- diff --git a/dali-toolkit/internal/controls/popup/popup-impl.cpp b/dali-toolkit/internal/controls/popup/popup-impl.cpp index 7374138..c7dd2e4 100644 --- a/dali-toolkit/internal/controls/popup/popup-impl.cpp +++ b/dali-toolkit/internal/controls/popup/popup-impl.cpp @@ -919,7 +919,6 @@ Toolkit::Control Popup::CreateBacking() // Must always be positioned top-left of stage, regardless of parent. backing.SetInheritPosition(false); - backing.SetAnchorPoint( AnchorPoint::TOP_LEFT ); // Always the full size of the stage. backing.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS ); diff --git a/dali-toolkit/public-api/controls/buttons/button.cpp b/dali-toolkit/public-api/controls/buttons/button.cpp index 2dd17c3..52ebd8f 100644 --- a/dali-toolkit/public-api/controls/buttons/button.cpp +++ b/dali-toolkit/public-api/controls/buttons/button.cpp @@ -97,7 +97,7 @@ void Button::SetInitialAutoRepeatingDelay( float initialAutoRepeatingDelay ) float Button::GetInitialAutoRepeatingDelay() const { - DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetPositionInheritanceMode() is deprecated and will be removed from next release. Use GetProperty INITIAL_AUTO_REPEATING_DELAY or Styling file instead.\n" ); + DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: GetInitialAutoRepeatingDelay() is deprecated and will be removed from next release. Use GetProperty INITIAL_AUTO_REPEATING_DELAY or Styling file instead.\n" ); return Dali::Toolkit::GetImplementation( *this ).GetInitialAutoRepeatingDelay(); }