Apply new indicator UI.

[platform/framework/native/uifw.git] / src / ui / controls / FUiCtrl_Form.cpp

diff --git a/src/ui/controls/FUiCtrl_Form.cpp b/src/ui/controls/FUiCtrl_Form.cpp
index c787553..7ec3058 100644 (file)
--- a/src/ui/controls/FUiCtrl_Form.cpp
+++ b/src/ui/controls/FUiCtrl_Form.cpp
@@ -1072,28 +1072,10 @@ _Form::SetFormStyle(unsigned long formStyle)
                GET_SHAPE_CONFIG(FORM::INDICATOR_HEIGHT, GetOrientation(), indicatorheight);
 
                __pIndicator->SetBounds(FloatRectangle(0.0f, 0.0f, indicatorwidth, indicatorheight));
-               r = AttachSystemChild(*__pIndicator);
-               SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
 
                r = GetLastResult();
                SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
        }
-       if (_FORM_STYLE_INDICATOR & formStyle)
-       {
-               r = SetIndicatorShowState(true);
-               SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
-       }
-       else if(FORM_STYLE_INDICATOR_AUTO_HIDE & formStyle)
-       {
-               r = SetIndicatorShowState(false, true);
-               r = GetLastResult();
-               SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
-       }
-       else
-       {
-               r = SetIndicatorShowState(false);
-               SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
-       }
 }
 
 result
@@ -2195,7 +2177,14 @@ _Form::GetIndicatorBounds(void) const
        int indicatorwidth = GetClientBounds().width;
        int indicatorheight = 0;
 
-       GET_SHAPE_CONFIG(FORM::INDICATOR_HEIGHT, GetOrientation(), indicatorheight);
+       if (GetOrientation() == _CONTROL_ORIENTATION_PORTRAIT)
+       {
+               GET_SHAPE_CONFIG(FORM::INDICATOR_HEIGHT, GetOrientation(), indicatorheight);
+       }
+       else
+       {
+               GET_SHAPE_CONFIG(FORM::INDICATOR_MINIMIZE_HEIGHT, GetOrientation(), indicatorheight);
+       }
 
        Rectangle rect (0, 0, indicatorwidth, indicatorheight);
 
@@ -2222,7 +2211,14 @@ _Form::GetIndicatorBoundsF(void) const
        float indicatorwidth = GetClientBoundsF().width;
        float indicatorheight = 0.0f;
 
-       GET_SHAPE_CONFIG(FORM::INDICATOR_HEIGHT, GetOrientation(), indicatorheight);
+       if (GetOrientation() == _CONTROL_ORIENTATION_PORTRAIT)
+       {
+               GET_SHAPE_CONFIG(FORM::INDICATOR_HEIGHT, GetOrientation(), indicatorheight);
+       }
+       else
+       {
+               GET_SHAPE_CONFIG(FORM::INDICATOR_MINIMIZE_HEIGHT, GetOrientation(), indicatorheight);
+       }
 
        FloatRectangle rect (0.0f, 0.0f, indicatorwidth, indicatorheight);