Hid the popups when Esc key is pressed

[apps/osp/Gallery.git] / src / GlFileListEditorForm.cpp

diff --git a/src/GlFileListEditorForm.cpp b/src/GlFileListEditorForm.cpp
index 85a0864..ef41843 100644 (file)
--- a/src/GlFileListEditorForm.cpp
+++ b/src/GlFileListEditorForm.cpp
@@ -362,14 +362,15 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId)
 
        case IDA_FOOTER_SHARE:
        {
-               if ( __pShareContextMenu != NULL)
+               if (__pShareContextMenu != NULL)
                {
                        delete __pShareContextMenu;
                        __pShareContextMenu = null;
                }
 
                __pShareContextMenu = new (std::nothrow) ContextMenu();
-               __pShareContextMenu->Construct(Point(GetClientAreaBounds().width/3 + 15, GetClientAreaBounds().height), CONTEXT_MENU_STYLE_LIST , CONTEXT_MENU_ANCHOR_DIRECTION_UPWARD);
+               __pShareContextMenu->Construct(Point(GetClientAreaBounds().width/3 + 15, GetClientAreaBounds().height),
+                               CONTEXT_MENU_STYLE_LIST, CONTEXT_MENU_ANCHOR_DIRECTION_UPWARD);
                __pShareContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_MESSAGE"),
                                IDA_CONTEXT_MENU_SHARE_MESSAGE);
                __pShareContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_EMAIL"),
@@ -889,7 +890,7 @@ FileListEditorForm::SetUpPopup(void)
        __pDeletePopup->AddControl(pLabelText);
 
        Button* pDeleteButton = new (std::nothrow) Button();
-       pDeleteButton->Construct(Rectangle(10, Y_DELETE_BUTTON, popupClientBounds.width / 2 - GAP_W_POPUP_ITEM -10, H_DELETE_BUTTON),
+       pDeleteButton->Construct(Rectangle(popupClientBounds.width / 2 + GAP_W_POPUP_ITEM, Y_DELETE_BUTTON, popupClientBounds.width / 2 - GAP_W_POPUP_ITEM -10, H_DELETE_BUTTON),
                        ResourceManager::GetString(L"IDS_COM_BODY_DELETE"));
        pDeleteButton->SetColor(BUTTON_STATUS_NORMAL, COLOR_DELETE_BUTTON_NORMAL);
        pDeleteButton->SetColor(BUTTON_STATUS_PRESSED, COLOR_DELETE_BUTTON_PRESSED);
@@ -899,8 +900,8 @@ FileListEditorForm::SetUpPopup(void)
        __pDeletePopup->AddControl(pDeleteButton);
 
        Button* pButtonCancel = new (std::nothrow) Button();
-       pButtonCancel->Construct(Rectangle(popupClientBounds.width / 2 + GAP_W_POPUP_ITEM, Y_DELETE_BUTTON,
-                       popupClientBounds.width / 2 - GAP_W_POPUP_ITEM -10, H_DELETE_BUTTON), ResourceManager::GetString(L"IDS_COM_POP_CANCEL"));
+       pButtonCancel->Construct(Rectangle(10, Y_DELETE_BUTTON, popupClientBounds.width / 2 - GAP_W_POPUP_ITEM -10, H_DELETE_BUTTON),
+                       ResourceManager::GetString(L"IDS_COM_POP_CANCEL"));
        pButtonCancel->SetActionId(IDA_DELETE_POPUP_CANCEL);
        pButtonCancel->AddActionEventListener(*this);
        __pDeletePopup->AddControl(pButtonCancel);
@@ -944,7 +945,7 @@ FileListEditorForm::RefreshFolderList(void)
        }
        __pContentDirectoryList = contentDirectory.GetContentDirectoryPathListN(SORT_ORDER_NONE);
 
-       if ( __pContentDirectoryNameList != NULL)
+       if (__pContentDirectoryNameList != NULL)
        {
                __pContentDirectoryNameList->RemoveAll(true);
                delete __pContentDirectoryNameList;
@@ -964,7 +965,7 @@ FileListEditorForm::RefreshFolderList(void)
                pDirPath = static_cast<String*>(__pContentDirectoryList->GetAt(i));
                pDirName = new (std::nothrow) String(GetDirecotyNameFromFullPath(*pDirPath));
 
-               if ( *pDirPath == mediaPath)
+               if (*pDirPath == mediaPath)
                {
                        *pDirName = ResourceManager::GetString(L"IDS_MEDIABR_POP_NO_NAME");
                        __pContentDirectoryNameList->Add(pDirName);
@@ -985,7 +986,7 @@ FileListEditorForm::RefreshFolderList(void)
                {
                        pDirName = static_cast<String*>(__pContentDirectoryNameList->GetAt(i));
 
-                       if ( *pDirName != __pPresentationModel->GetCurrentAlbumName())
+                       if (*pDirName != __pPresentationModel->GetCurrentAlbumName())
                        {
                                __pOptionMenu->AddItem(*(new (std::nothrow) String(*pDirName)),
                                                IDA_CONTEXTMENU_EDITOR_MOVE_ALBUM_ARRAY_START + i);
@@ -1031,7 +1032,7 @@ FileListEditorForm::OnFormBackRequested(Form& source)
                }
                else if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_SELECTION)
                {
-                       if (__pShareContextMenu != null && __pShareContextMenu->GetShowState() == true )
+                       if (__pShareContextMenu != null && __pShareContextMenu->GetShowState() == true)
                        {
                                __pShareContextMenu->SetShowState(false);
                        }
@@ -1049,8 +1050,6 @@ FileListEditorForm::OnFormBackRequested(Form& source)
 
                                        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALL_LIST_EDITOR, SCENE_TRANSITION_ANIMATION_TYPE_NONE,
                                                        SCENE_HISTORY_OPTION_ADD_HISTORY, SCENE_DESTROY_OPTION_DESTROY), pList);
-
-
                                }
                        }
                }
@@ -1102,6 +1101,7 @@ FileListEditorForm::SetFooterButtonsState(const bool enableState)
 void
 FileListEditorForm::OnOrientationChanged(const Tizen::Ui::Control &source, Tizen::Ui::OrientationStatus orientationStatus)
 {
+       AppLogDebug("ENTER");
        SceneManager* pSceneManager = SceneManager::GetInstance();
        pSceneManager->GetCurrentScene();
 
@@ -1137,6 +1137,7 @@ FileListEditorForm::OnOrientationChanged(const Tizen::Ui::Control &source, Tizen
                        pEditorPanel->ChangeOrientation();
                }
        }
+       AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }
 
 bool
@@ -1144,13 +1145,15 @@ FileListEditorForm::OnKeyReleased(Control& source, const Tizen::Ui::KeyEventInfo
 {
        AppLogDebug("ENTER");
 
-       if(keyEventInfo.GetKeyCode() == KEY_BACK)
+       if(keyEventInfo.GetKeyCode() == KEY_BACK || keyEventInfo.GetKeyCode() == KEY_ESC)
        {
                _overlayMsg = false;
                __pDeletePopup->SetShowState(false);
                __pDeletePopup->Invalidate(true);
        }
-       return true;
+       AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
+
+       return false;
 }
 
 result
@@ -1296,16 +1299,16 @@ FileListEditorForm::OnFormMenuRequested (Tizen::Ui::Controls::Form &source)
                }
        }
 
-       if (__pShareContextMenu != null && __pShareContextMenu->GetShowState() == true )
+       if (__pShareContextMenu != null && __pShareContextMenu->GetShowState() == true)
        {
                __pShareContextMenu->SetShowState(false);
        }
 
-       if ( checkedCount > 0)
+       if (checkedCount > 0)
        {
-               if ( __pOptionMenu == null )
+               if (__pOptionMenu == null)
                {
-                       return ;
+                       return;
                }
 
                __pOptionMenu->RemoveAllItems();
@@ -1325,6 +1328,5 @@ FileListEditorForm::OnFormMenuRequested (Tizen::Ui::Controls::Form &source)
 
                __pOptionMenu->SetShowState(true);
                __pOptionMenu->Show();
-
        }
 }