Fixed Split Window

Change-Id: I3518c63897f747cd0d845708a08d4a8a5869848a
Signed-off-by: Choi Munseok <ms47.choi@samsung.com>

diff --git a/src/ui/FUi_EcoreEvas.cpp b/src/ui/FUi_EcoreEvas.cpp
index 9931d42..5ecae6a 100644 (file)
--- a/src/ui/FUi_EcoreEvas.cpp
+++ b/src/ui/FUi_EcoreEvas.cpp
@@ -386,8 +386,7 @@ OnWindowConfigured(void* pData, int type, void* pEvent)
        Ecore_X_Window win = (Ecore_X_Window)pFrame->GetNativeHandle();
        Dimension screenSize = pControlManager->GetScreenSize();
 
-// _PARTIAL_SCREEN_
-#if 0
+#if 0 // Partial Screen
        if (win != targetWin)
        {
                return ECORE_CALLBACK_PASS_ON;
@@ -405,6 +404,14 @@ OnWindowConfigured(void* pData, int type, void* pEvent)
                        pFrame->SetPartialScreenEnabled(true);
                }
        }
+       else if (pFrame->GetShowMode() == FRAME_SHOW_MODE_PARTIAL_SCREEN)
+       {
+               Dimension winSize = _CoordinateSystemUtils::InverseTransform(Dimension(pE->w, pE->h));
+               if (winSize == screenSize)
+               {
+                       pFrame->SetPartialScreenEnabled(false);
+               }
+       }
 #else
        if ((pFrame->GetShowMode() == FRAME_SHOW_MODE_FULL_SCREEN) || (win != targetWin))
        {
@@ -451,8 +458,7 @@ OnWindowConfigured(void* pData, int type, void* pEvent)
                pFrame->SetChangedPositionByUser(isChanged);
                pFrame->SetChangingBoundsEnabled(true);
 
-// _PARTIAL_SCREEN_
-#if 0
+#if 0 // Partial Screen
                Rectangle frameBounds = pFrame->GetBounds();
                Rectangle frameClientBounds = pFrame->GetClientBounds();
                Rectangle frameAbsoluteBounds = pFrame->GetAbsoluteBounds();

diff --git a/src/ui/FUi_Window.cpp b/src/ui/FUi_Window.cpp
index e3d7d97..a1b418b 100644 (file)
--- a/src/ui/FUi_Window.cpp
+++ b/src/ui/FUi_Window.cpp
@@ -706,8 +706,7 @@ _Window::OnWindowStateChanged(void)
                                        pFormImpl->UpdateOrientation();
                                }
 
-// _PARTIAL_SCREEN_
-#if 0
+#if 0 // Partial Screen
                                Rectangle frameBounds = GetBounds();
                                Rectangle frameClientBounds = GetClientBounds();
                                Rectangle frameAbsoluteBounds = GetAbsoluteBounds();

diff --git a/src/ui/controls/FUiCtrl_Frame.cpp b/src/ui/controls/FUiCtrl_Frame.cpp
index d8f0d76..e4aa8a9 100644 (file)
--- a/src/ui/controls/FUiCtrl_Frame.cpp
+++ b/src/ui/controls/FUiCtrl_Frame.cpp
@@ -1030,6 +1030,10 @@ _Frame::SetPartialScreenEnabled(bool enable)
        {
                __showMode = FRAME_SHOW_MODE_PARTIAL_SCREEN;
        }
+       else
+       {
+               SetShowMode(FRAME_SHOW_MODE_FULL_SCREEN);
+       }
 }
 
 Tizen::Base::Collection::IListT<_Control*>*