From: HyukSoon Choi Date: Thu, 4 Jul 2013 07:46:21 +0000 (+0900) Subject: return false - KeyPress; X-Git-Tag: submit/tizen_2.2/20130714.134410~14 X-Git-Url: http://review.tizen.org/git/?p=apps%2Fosp%2FGallery.git;a=commitdiff_plain;h=02a670cd4ae5cf0a990833b83132062ee1bb3119 return false - KeyPress; Change-Id: Ic50d976775f8e73a3a4b104cd06599b79ce8d941 Signed-off-by: HyukSoon Choi --- diff --git a/inc/GlAlbumListEditorForm.h b/inc/GlAlbumListEditorForm.h index 5c320c7..227af50 100644 --- a/inc/GlAlbumListEditorForm.h +++ b/inc/GlAlbumListEditorForm.h @@ -80,7 +80,7 @@ public: virtual void OnFileOpInvalidate(enum FileActionMode actionId); virtual void OnFileOpComplete(enum FileActionMode actionId, enum FileActionCompleteRes); - virtual bool OnKeyPressed(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo){ return true;} + virtual bool OnKeyPressed(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo){ return false;} virtual bool OnKeyReleased(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo); virtual bool OnPreviewKeyPressed(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo){ return false; } virtual bool OnPreviewKeyReleased(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo){ return false; } diff --git a/inc/GlFileListEditorForm.h b/inc/GlFileListEditorForm.h index 3263a19..c4484a8 100644 --- a/inc/GlFileListEditorForm.h +++ b/inc/GlFileListEditorForm.h @@ -78,7 +78,7 @@ public: virtual void OnOrientationChanged(const Tizen::Ui::Control &source, Tizen::Ui::OrientationStatus orientationStatus); - virtual bool OnKeyPressed(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo){ return true; } + virtual bool OnKeyPressed(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo){ return false; } virtual bool OnKeyReleased(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo); virtual bool OnPreviewKeyPressed(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo){ return false; } virtual bool OnPreviewKeyReleased(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo){ return false; } diff --git a/inc/GlSlideShowPopUp.h b/inc/GlSlideShowPopUp.h index 3e5c08c..af9adee 100644 --- a/inc/GlSlideShowPopUp.h +++ b/inc/GlSlideShowPopUp.h @@ -61,10 +61,10 @@ public: virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId); - virtual bool OnKeyPressed(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo){ return true; }; + virtual bool OnKeyPressed(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo){return false;}; virtual bool OnKeyReleased(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo); - virtual bool OnPreviewKeyPressed(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo){ return false;}; - virtual bool OnPreviewKeyReleased(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo){ return false;}; + virtual bool OnPreviewKeyPressed(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo){return false;}; + virtual bool OnPreviewKeyReleased(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo){return false;}; private: Tizen::Ui::Controls::ListView* __pList; diff --git a/src/GlAlbumListEditorForm.cpp b/src/GlAlbumListEditorForm.cpp index 2f6df37..a59d0cf 100644 --- a/src/GlAlbumListEditorForm.cpp +++ b/src/GlAlbumListEditorForm.cpp @@ -759,18 +759,20 @@ void AlbumListEditorForm::OnFileOpComplete(enum FileActionMode actionId, enum Fi SceneManager* pSceneManager = SceneManager::GetInstance(); AppAssert(pSceneManager); pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALBUM_LIST)); + AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); } bool AlbumListEditorForm::OnKeyReleased(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo) { AppLogDebug("ENTER"); - if(keyEventInfo.GetKeyCode() == KEY_BACK) { __pDeletePopup->SetShowState(false); __pDeletePopup->Show(); } - return true; + AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); + + return false; } result diff --git a/src/GlFileListEditorForm.cpp b/src/GlFileListEditorForm.cpp index 85a0864..48d2bac 100644 --- a/src/GlFileListEditorForm.cpp +++ b/src/GlFileListEditorForm.cpp @@ -1049,8 +1049,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 +1100,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 +1136,7 @@ FileListEditorForm::OnOrientationChanged(const Tizen::Ui::Control &source, Tizen pEditorPanel->ChangeOrientation(); } } + AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); } bool @@ -1150,7 +1150,9 @@ FileListEditorForm::OnKeyReleased(Control& source, const Tizen::Ui::KeyEventInfo __pDeletePopup->SetShowState(false); __pDeletePopup->Invalidate(true); } - return true; + AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); + + return false; } result diff --git a/src/GlSlideShowPopUp.cpp b/src/GlSlideShowPopUp.cpp index a15ae72..ca4af7b 100644 --- a/src/GlSlideShowPopUp.cpp +++ b/src/GlSlideShowPopUp.cpp @@ -119,7 +119,7 @@ SlideShowPopUp::OnKeyReleased(Control& source, const Tizen::Ui::KeyEventInfo& ke Popup::SetShowState(false); Popup::Show(); } - return true; + return false; } ListItemBase*