Fixed Nabi issues N_SE-52797, N_SE-52791, N_SE-52513

Change-Id: Ife9667b925f2631868c3629a753623311c954ae8

diff --git a/inc/IntTypes.h b/inc/IntTypes.h
index f2af974..8caa8d2 100644 (file)
--- a/inc/IntTypes.h
+++ b/inc/IntTypes.h
@@ -35,6 +35,7 @@ static const int MAX_NOTEBOOK_TABLE_COLUMN = 8;
 static const int IDA_BUTTON_NO = 1000;
 static const int IDA_BUTTON_YES = 1001;
 
+const int UPDATE_MAINFORM_FOOTER_ON_WINDOWCLOSED = 996;
 const int APPCONTROL_LAUNCH_MAX_LIMIT_REACHED = 997;
 const int FORE_GROUND_APP_EVENT = 998;
 const int BACK_GROUND_APP_EVENT = 999;

diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp
index 6ff9615..ec2673a 100644 (file)
--- a/src/IntMainForm.cpp
+++ b/src/IntMainForm.cpp
@@ -4174,23 +4174,23 @@ MainForm::OnWebWindowCloseRequested(Tizen::Web::Controls::Web& source)
        for (int count = 0; count < totalCount; count++)
        {
                pWindowInfo = dynamic_cast< WindowInfo* >(pAllWindowList->GetAt(count));
-               if (pSceneManager != null && pWindowInfo != null && pSceneManager->GetCurrentSceneId() == pWindowInfo->sceneID)
-               {
-                       r = SceneRegister::DestroyAndUnRegisterScene(pWindowInfo->sceneID);
-                       if (IsFailed(r))
-                       {
-                               AppLogException("OnActionPerformed failed with %s", GetErrorMessage(r));
-                               return;
-                       }
 
+               if (__pWindowInfo != null && pWindowInfo != null && __pWindowInfo->sceneID == pWindowInfo->sceneID)
+               {
+                       r = SceneRegister::DestroyAndUnRegisterScene(__pWindowInfo->sceneID);
                        r = pAllWindowList->RemoveAt(count, true);
 
-                       if(count > 0)
+                       Form* pCurrentForm = null;
+                       if(SceneManager::GetInstance()->GetCurrentScene() != null)
+                               pCurrentForm = (SceneManager::GetInstance()->GetCurrentScene()->GetForm());
+                       if (pCurrentForm)
                        {
-                               pNewWindowInfo = dynamic_cast< WindowInfo* >(pAllWindowList->GetAt(count - 1));
+                               pCurrentForm->SendUserEvent(UPDATE_MAINFORM_FOOTER_ON_WINDOWCLOSED, null);
                        }
-                       else if(pAllWindowList->GetCount() > 0)
+
+                       if (pAllWindowList->GetCount() > 0)
                        {
+                               pNewWindowInfo = null;
                                pNewWindowInfo = dynamic_cast< WindowInfo* >(pAllWindowList->GetAt(pAllWindowList->GetCount() - 1));
                        }
                        else
@@ -4235,15 +4235,15 @@ MainForm::OnWebWindowCloseRequested(Tizen::Web::Controls::Web& source)
                                        r = pApp->GetFrameAt(0)->SetShowMode(FRAME_SHOW_MODE_MINIMIZED);
                                        return;
                                }
-
                        }
                        r = pSceneManager->GoForward(ForwardSceneTransition(pNewWindowInfo->sceneID ,SCENE_TRANSITION_ANIMATION_TYPE_NONE,SCENE_HISTORY_OPTION_ADD_HISTORY,SCENE_DESTROY_OPTION_DESTROY));
 
-                       __pWindowInfo = null;
                        break;
                }
+
        }
 
+
 }
 
 void
@@ -5842,7 +5842,12 @@ void MainForm::OnSharePopupControlStarted(void)
 void
 MainForm::OnUserEventReceivedN (RequestId requestId, Tizen::Base::Collection::IList *pArgs)
 {
-       if (requestId == BACK_GROUND_APP_EVENT)
+       if (requestId == UPDATE_MAINFORM_FOOTER_ON_WINDOWCLOSED)
+       {
+               AppLog("OnWebWindowCloseRequested mainform test 1 OnUserEventReceivedN");
+               InitFooter();
+       }
+       else if (requestId == BACK_GROUND_APP_EVENT)
        {
                if(__pWebViewer != null)
                {

diff --git a/src/IntSettingToggleCustomItem.cpp b/src/IntSettingToggleCustomItem.cpp
index caf8e94..30977c7 100644 (file)
--- a/src/IntSettingToggleCustomItem.cpp
+++ b/src/IntSettingToggleCustomItem.cpp
@@ -80,7 +80,7 @@ SettingToggleCustomItem::Make(void)
        const int Y_Margin = 26;
        const int textSize = 40;
 
-       AddElement(Rectangle(X_Margin, Y_Margin, __width - 180, 60 + (__fontSize - 44)), IDA_FORMAT_STRING, __text, __fontSize, textColor, pressedTextColor, pressedTextColor, true);
+       AddElement(Rectangle(X_Margin, Y_Margin, __width - 185, 60 + (__fontSize - 44)), IDA_FORMAT_STRING, __text, __fontSize, textColor, pressedTextColor, pressedTextColor, true);
 //     SetElementSelectionEnabled(IDA_FORMAT_STRING, false);
 
        return E_SUCCESS;