Fixed indicator bug.

Change-Id: I91b827189948b96aea257bc0a6f34cdcbbd2633c

diff --git a/src/ui/controls/FUiCtrl_Form.cpp b/src/ui/controls/FUiCtrl_Form.cpp
index c06a9f0..c42355a 100644 (file)
--- a/src/ui/controls/FUiCtrl_Form.cpp
+++ b/src/ui/controls/FUiCtrl_Form.cpp
@@ -2937,15 +2937,26 @@ _Form::SetIndicatorShowState(bool state, bool hide)
        if (pFrame && IsAttachedToMainTree())
        {
                FrameShowMode mode = pFrame->GetShowMode();
-               if (mode == FRAME_SHOW_MODE_FULL_SCREEN)
+               if (mode != FRAME_SHOW_MODE_FULL_SCREEN)
                {
-                       r = __pIndicator->SetIndicatorShowState(state, hide);
-                       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+                       if (mode == FRAME_SHOW_MODE_MINIMIZED)
+                       {
+                               if (pFrame->GetShowMode(false) == FRAME_SHOW_MODE_FULL_SCREEN)
+                               {
+                                       r = __pIndicator->SetIndicatorShowState(state, hide);
+                                       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+                               }
+                       }
+                       else
+                       {
+                               r = __pIndicator->SetIndicatorShowState(false);
+                               return r;
+                       }
                }
-               else
+               else if (mode == FRAME_SHOW_MODE_FULL_SCREEN)
                {
-                       r = __pIndicator->SetIndicatorShowState(false);
-                       return r;
+                       r = __pIndicator->SetIndicatorShowState(state, hide);
+                       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
                }
        }
        else if (!pFrame && IsAttachedToMainTree())
@@ -2969,7 +2980,19 @@ _Form::SetIndicatorOpacity(_IndicatorOpacity opacity)
        if (pFrame && IsAttachedToMainTree())
        {
                FrameShowMode mode = pFrame->GetShowMode();
-               if (mode == FRAME_SHOW_MODE_FULL_SCREEN)
+
+               if (mode != FRAME_SHOW_MODE_FULL_SCREEN)
+               {
+                       if (mode == FRAME_SHOW_MODE_MINIMIZED)
+                       {
+                               if (pFrame->GetShowMode(false) == FRAME_SHOW_MODE_FULL_SCREEN)
+                               {
+                                       r = __pIndicator->SetIndicatorOpacity(opacity);
+                                       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+                               }
+                       }
+               }
+               else if (mode == FRAME_SHOW_MODE_FULL_SCREEN)
                {
                        r = __pIndicator->SetIndicatorOpacity(opacity);
                        SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));

diff --git a/src/ui/controls/FUiCtrl_Popup.cpp b/src/ui/controls/FUiCtrl_Popup.cpp
index 5a4661c..828043d 100644 (file)
--- a/src/ui/controls/FUiCtrl_Popup.cpp
+++ b/src/ui/controls/FUiCtrl_Popup.cpp
@@ -568,6 +568,10 @@ _Popup::InitializeAccessibilityElement(void)
 result
 _Popup::OnDetachingFromMainTree(void)
 {
+       if (__pIndicator)
+       {
+               __pIndicator->DeleteIndicatorObject();
+       }
        return _Window::OnDetachingFromMainTree();
 }