Remove context menu - Back key pressed

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

diff --git a/src/GlFileListEditorForm.cpp b/src/GlFileListEditorForm.cpp
index 7646421..f229826 100644 (file)
--- a/src/GlFileListEditorForm.cpp
+++ b/src/GlFileListEditorForm.cpp
@@ -58,7 +58,7 @@ static const unsigned int COLOR_DELETE_BUTTON_TEXT = Color32<248, 246, 239>::Val
 static const String RESERVED_MEDIA_PATH = Environment::GetMediaPath();
 
 FileListEditorForm::FileListEditorForm(void)
-       : __pContextMenuShare(null)
+       : __pShareContextMenu(null)
        , __pOptionMenu(null)
        , __pDeletePopup(null)
        , __morePosition(Point(0, 0))
@@ -318,11 +318,11 @@ FileListEditorForm::OnTerminating(void)
                __pOptionMenu = null;
        }
 
-       if (__pContextMenuShare != null)
+       if (__pShareContextMenu != null)
        {
-               __pContextMenuShare->RemoveActionEventListener(*this);
-               delete __pContextMenuShare;
-               __pContextMenuShare = null;
+               __pShareContextMenu->RemoveActionEventListener(*this);
+               delete __pShareContextMenu;
+               __pShareContextMenu = null;
        }
 
        if (__pDeletePopup != null)
@@ -351,34 +351,33 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId)
 
        case IDA_FOOTER_SHARE:
        {
-               if ( __pContextMenuShare != NULL)
+               if ( __pShareContextMenu != NULL)
                {
-                       delete __pContextMenuShare;
-                       __pContextMenuShare = null;
+                       delete __pShareContextMenu;
+                       __pShareContextMenu = null;
                }
 
-               __pContextMenuShare = new (std::nothrow) ContextMenu();
-               __pContextMenuShare->Construct(Point(GetClientAreaBounds().width/3 + 15, GetClientAreaBounds().height), CONTEXT_MENU_STYLE_LIST , CONTEXT_MENU_ANCHOR_DIRECTION_UPWARD);
-               __pContextMenuShare->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_MESSAGE"),
+               __pShareContextMenu = new (std::nothrow) ContextMenu();
+               __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);
-               __pContextMenuShare->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_EMAIL"),
+               __pShareContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_EMAIL"),
                                IDA_CONTEXT_MENU_SHARE_EMAIL);
-               __pContextMenuShare->AddActionEventListener(*this);
-
-
+               __pShareContextMenu->SetFocusable(true);
+               __pShareContextMenu->AddActionEventListener(*this);
 
                        Rectangle rect = source.GetBounds();
                        if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_SELECTION)
                        {
-                               __pContextMenuShare->SetAnchorPosition(Point(rect.width / 8 * 3, rect.y));
+                               __pShareContextMenu->SetAnchorPosition(Point(rect.width / 8 * 3, rect.y));
                        }
                        else
                        {
-                               __pContextMenuShare->SetAnchorPosition(Point(rect.width / 8 * 3, rect.y - H_TOAST_LABEL));
+                               __pShareContextMenu->SetAnchorPosition(Point(rect.width / 8 * 3, rect.y - H_TOAST_LABEL));
                        }
 
-                       __pContextMenuShare->SetShowState(true);
-                       __pContextMenuShare->Show();
+                       __pShareContextMenu->SetShowState(true);
+                       __pShareContextMenu->Show();
 
        }
        break;
@@ -1010,9 +1009,9 @@ FileListEditorForm::OnFormBackRequested(Form& source)
                }
                else if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_SELECTION)
                {
-                       if (__pContextMenuShare != null && __pContextMenuShare->GetShowState() == true )
+                       if (__pShareContextMenu != null && __pShareContextMenu->GetShowState() == true )
                        {
-                               __pContextMenuShare->SetShowState(false);
+                               __pShareContextMenu->SetShowState(false);
                        }
                        else
                        {
@@ -1262,9 +1261,9 @@ FileListEditorForm::OnFormMenuRequested (Tizen::Ui::Controls::Form &source)
                }
        }
 
-       if (__pContextMenuShare != null && __pContextMenuShare->GetShowState() == true )
+       if (__pShareContextMenu != null && __pShareContextMenu->GetShowState() == true )
        {
-               __pContextMenuShare->SetShowState(false);
+               __pShareContextMenu->SetShowState(false);
        }
 
        if ( checkedCount > 0)