From ae59f2ed1fd067050fb57465b9623160d995e02e Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Tue, 4 Jul 2017 10:36:05 +0900 Subject: [PATCH 1/1] Fix a popup position error caused by SetInheritPosition() change Change-Id: I26e9a223a214111a6ae3d7f30fc2d79342b4b189 --- dali-toolkit/internal/controls/popup/popup-impl.cpp | 1 - dali-toolkit/public-api/controls/buttons/button.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) 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(); } -- 2.7.4