Logic that attaching indicator was fixed.

Change-Id: I1d138ca9db85dca4d77e3946d890df53bf60c4ea

diff --git a/src/ui/controls/FUiCtrl_Form.cpp b/src/ui/controls/FUiCtrl_Form.cpp
index 1cd41df..a5a8799 100644 (file)
--- a/src/ui/controls/FUiCtrl_Form.cpp
+++ b/src/ui/controls/FUiCtrl_Form.cpp
@@ -28,6 +28,8 @@
 #include <FGrpFloatRectangle.h>
 #include <FBase_Log.h>
 #include <FGrp_BitmapImpl.h>
+#include "FUiAnim_ControlVisualElement.h"
+#include "FUiAnim_VisualElementImpl.h"
 #include "FUi_ResourceManager.h"
 #include "FUi_EcoreEvasMgr.h"
 #include "FUi_EcoreEvas.h"
@@ -1230,6 +1232,12 @@ _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));
+
+               _VisualElementImpl* pImpl = _VisualElementImpl::GetInstance(*__pIndicator->GetVisualElement());
+
+               result r = pImpl->SetZOrderGroup(_ControlVisualElement::Z_ORDER_GROUP_CONTROL + 4);
 
                r = GetLastResult();
                SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
@@ -2739,7 +2747,15 @@ _Form::OnBoundsChanged(void)
 
        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);
+       }
+
        if (__pIndicator)
        {
                        __pIndicator->SetBounds(FloatRectangle(0.0f, 0.0f, GetClientBoundsF().width, indicatorheight));

diff --git a/src/ui/controls/FUiCtrl_FormImpl.cpp b/src/ui/controls/FUiCtrl_FormImpl.cpp
index 4562b58..f9975c6 100644 (file)
--- a/src/ui/controls/FUiCtrl_FormImpl.cpp
+++ b/src/ui/controls/FUiCtrl_FormImpl.cpp
@@ -382,13 +382,6 @@ _FormImpl::SetFormStyle(unsigned long formStyle)
                }
        }
 
-       _Indicator* pIndicator = GetCore().GetIndicator();
-       if (pIndicator && !pIndicator->IsAttachedToMainTree())
-       {
-               r = GetCore().AttachSystemChild(*pIndicator);
-               SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
-       }
-
        if (formStyle & FORM_STYLE_TEXT_TAB)
        {
                float titleHeight = 0.0f;