Fixed Indicator width.
authorKeuckdo Bang <keuckdo.bang@samsung.net>
Fri, 6 Sep 2013 06:22:56 +0000 (15:22 +0900)
committerKeuckdo Bang <keuckdo.bang@samsung.net>
Fri, 6 Sep 2013 06:22:56 +0000 (15:22 +0900)
Change-Id: Iaef9586ec0c83972bf90c4f915ec1d58585953cb

src/ui/controls/FUiCtrl_Indicator.cpp

index cc7b448..78e842c 100644 (file)
@@ -1095,6 +1095,9 @@ _Indicator::OnVisualElementAnimationRepeated(const Tizen::Ui::Animations::Visual
 void
 _Indicator::OnVisualElementAnimationFinished(const Tizen::Ui::Animations::VisualElementAnimation& animation, const Tizen::Base::String& keyName, Tizen::Ui::Animations::VisualElement& target, bool completedNormally)
 {
+       const FloatDimension portraitSize = _ControlManager::GetInstance()->_ControlManager::GetScreenSizeF();
+       const FloatDimension landscapeSize = FloatDimension(portraitSize.height, portraitSize.width);
+
        String* pUserData = (String*) animation.GetUserData();
 
        if ((pUserData != null) && (*pUserData == String(L"UpAnimation")))
@@ -1103,7 +1106,6 @@ _Indicator::OnVisualElementAnimationFinished(const Tizen::Ui::Animations::Visual
 
                int indicatorHeight = 0;
                GET_SHAPE_CONFIG(FORM::INDICATOR_HEIGHT, __pWindow->GetOrientation(), indicatorHeight);
-               SetBounds(FloatRectangle(0.0f, 0.0f, GetIndicatorBoundsF().width, indicatorHeight));
 
                if (__orientation == _CONTROL_ORIENTATION_PORTRAIT)
                {
@@ -1115,6 +1117,7 @@ _Indicator::OnVisualElementAnimationFinished(const Tizen::Ui::Animations::Visual
                                        __pPortraitVisualElement->SetShowState(false);
                                }
                        }
+                       SetBounds(FloatRectangle(0.0f, 0.0f, portraitSize.width, indicatorHeight));
                }
                else
                {
@@ -1126,6 +1129,7 @@ _Indicator::OnVisualElementAnimationFinished(const Tizen::Ui::Animations::Visual
                                        __pLandscapeVisualElement->SetShowState(false);
                                }
                        }
+                       SetBounds(FloatRectangle(0.0f, 0.0f, landscapeSize.width, indicatorHeight));
                }
                delete pUserData;
        }