Fixed showstate of indicator when form isn't added to frame.

Change-Id: I66088b88ab054f8e4c926073f2f3498f63110e86

diff --git a/src/ui/controls/FUiCtrl_Form.cpp b/src/ui/controls/FUiCtrl_Form.cpp
index e1251d4..542cb94 100644 (file)
--- a/src/ui/controls/FUiCtrl_Form.cpp
+++ b/src/ui/controls/FUiCtrl_Form.cpp
@@ -2948,7 +2948,7 @@ _Form::SetIndicatorShowState(bool state)
        }
        else if (!pFrame && IsAttachedToMainTree())
        {
-               r = __pIndicator->SetIndicatorShowState(false);
+               __pIndicator->SetShowState(false);
        }
 
        __indicatorShowState = state;

diff --git a/src/ui/controls/FUiCtrl_FormImpl.cpp b/src/ui/controls/FUiCtrl_FormImpl.cpp
index f7c238a..b9eeb33 100644 (file)
--- a/src/ui/controls/FUiCtrl_FormImpl.cpp
+++ b/src/ui/controls/FUiCtrl_FormImpl.cpp
@@ -335,6 +335,15 @@ _FormImpl::SetFormStyle(unsigned long formStyle)
                }
                else
                {
+                       if (OnFormOrientationStatusRequested() == ORIENTATION_STATUS_PORTRAIT || OnFormOrientationStatusRequested() == ORIENTATION_STATUS_PORTRAIT_REVERSE)
+                       {
+                               GetCore().SetIndicatorShowState(true);
+                       }
+                       else
+                       {
+                               GetCore().SetIndicatorShowState(false);
+                       }
+
                        GetCore().SetIndicatorAutoHide(false, false);
                }
                r = GetLastResult();
@@ -1249,6 +1258,10 @@ _FormImpl::OnChangeLayout(_ControlOrientation orientation)
                                {
                                        GetCore().SetIndicatorShowState(true);
                                }
+                               else
+                               {
+                                       GetCore().SetIndicatorShowState(false);
+                               }
                        }
                }
                GetCore().AdjustClientBounds();
@@ -1262,7 +1275,6 @@ _FormImpl::OnChangeLayout(_ControlOrientation orientation)
                pIndicator->OnChangeLayout(orientation);
        }
 
-
        float adjHeight = 0.0f;
 
        if (GetCore().HasHeader())

diff --git a/src/ui/controls/FUiCtrl_Indicator.cpp b/src/ui/controls/FUiCtrl_Indicator.cpp
index 3fed93a..6ff33ea 100644 (file)
--- a/src/ui/controls/FUiCtrl_Indicator.cpp
+++ b/src/ui/controls/FUiCtrl_Indicator.cpp
@@ -465,7 +465,6 @@ _Indicator::OnChangeLayout(_ControlOrientation orientation)
                }
                else
                {
-                       SetIndicatorShowState(false);
                        SetIndicatorOpacity(__opacity);
                        ecore_x_e_illume_indicator_opacity_set(win, ECORE_X_ILLUME_INDICATOR_OPAQUE);
                }

diff --git a/src/ui/controls/FUiCtrl_Popup.cpp b/src/ui/controls/FUiCtrl_Popup.cpp
index c64b61c..8c8d892 100644 (file)
--- a/src/ui/controls/FUiCtrl_Popup.cpp
+++ b/src/ui/controls/FUiCtrl_Popup.cpp
@@ -813,6 +813,10 @@ _Popup::OnChangeLayout(_ControlOrientation orientation)
                                {
                                        __pIndicator->SetIndicatorShowState(true);
                                }
+                               else
+                               {
+                                       __pIndicator->SetIndicatorShowState(false);
+                               }
                        }
                        __pIndicator->OnChangeLayout(orientation);
                }