From 9eb2ef377456666446f1a5d0323706e3bef817ce Mon Sep 17 00:00:00 2001 From: Kim Tae Soo Date: Mon, 30 Mar 2015 16:52:02 +0900 Subject: [PATCH] Remove temporary modification : Remove unnecessary IActivatedListener form layout source. : It was added due to the EFL bug and bug is fixed now. Change-Id: Ifb80dfdae2ec9d3141b2615cdea828f629fadc07 Signed-off-by: Kim Tae Soo --- include/album-layout.h | 13 +++++++------ include/album-songs-layout.h | 3 --- include/category-layout.h | 13 ++++++++----- include/category-songs-layout.h | 3 --- include/folder-layout.h | 14 ++++++++------ include/song-layout.h | 3 --- src/views/album-layout.cpp | 15 +-------------- src/views/album-songs-layout.cpp | 15 +-------------- src/views/category-layout.cpp | 15 +-------------- src/views/category-songs-layout.cpp | 20 +------------------- src/views/folder-layout.cpp | 15 +-------------- src/views/song-layout.cpp | 15 +-------------- 12 files changed, 29 insertions(+), 115 deletions(-) diff --git a/include/album-layout.h b/include/album-layout.h index 7901cf7..ad7506f 100644 --- a/include/album-layout.h +++ b/include/album-layout.h @@ -20,10 +20,13 @@ struct SAlbumItemInfo; -class CAlbumLayout : public CExtBaseLayout, public CListenerMgr, - public IKeyDownListener, public IMouseMoveListener, - public IRealizedListener, public IUnrealizedListener, - public IActivatedListener { +class CAlbumLayout : + public CExtBaseLayout, + public CListenerMgr, + public IKeyDownListener, + public IMouseMoveListener, + public IRealizedListener, + public IUnrealizedListener { private: struct SAlbumLayout *m; @@ -64,7 +67,6 @@ public: IMouseMoveListener(this), IRealizedListener(this), IUnrealizedListener(this), - IActivatedListener(this), m(0) {} virtual ~CAlbumLayout() {} @@ -81,7 +83,6 @@ public: virtual void OnMouseMove(int id, Evas *e, Evas_Object *obj, Evas_Event_Mouse_Move *ev); virtual void OnRealized(int id, Evas_Object *obj, Elm_Object_Item *item); virtual void OnUnrealized(int id, Evas_Object *obj, Elm_Object_Item *item); - virtual void OnActivated(int id, Evas_Object *obj, Elm_Object_Item *item); }; diff --git a/include/album-songs-layout.h b/include/album-songs-layout.h index a30ac3f..67f2cdf 100644 --- a/include/album-songs-layout.h +++ b/include/album-songs-layout.h @@ -26,7 +26,6 @@ class CAlbumSongsLayout : public IKeyDownListener, public IMouseMoveListener, public IMouseClickedListener, - public IActivatedListener, public IRealizedListener { private: struct SAlbumSongsLayout *m; @@ -67,7 +66,6 @@ public: IKeyDownListener(this), IMouseMoveListener(this), IMouseClickedListener(this), - IActivatedListener(this), IRealizedListener(this), m(0) {} virtual ~CAlbumSongsLayout() {} @@ -84,7 +82,6 @@ public: virtual void OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Key_Down *ev); virtual void OnMouseMove(int id, Evas *e, Evas_Object *obj, Evas_Event_Mouse_Move *ev); virtual void OnMouseClicked(int id, Evas_Object *obj); - virtual void OnActivated(int id, Evas_Object *obj, Elm_Object_Item *item); virtual void OnRealized(int id, Evas_Object *obj, Elm_Object_Item *item); }; diff --git a/include/category-layout.h b/include/category-layout.h index 26d6cf0..39fa564 100644 --- a/include/category-layout.h +++ b/include/category-layout.h @@ -18,9 +18,14 @@ #define __CATEGORY_LAYOUT_H__ -class CCategoryLayout : public CExtBaseLayout, public CListenerMgr, - public IKeyDownListener, public IMouseClickedListener, public IMouseMoveListener, - public IRealizedListener, public IUnrealizedListener, public IActivatedListener { +class CCategoryLayout : + public CExtBaseLayout, + public CListenerMgr, + public IKeyDownListener, + public IMouseClickedListener, + public IMouseMoveListener, + public IRealizedListener, + public IUnrealizedListener { private: struct SCategoryLayout *m; @@ -138,7 +143,6 @@ public: IMouseMoveListener(this), IRealizedListener(this), IUnrealizedListener(this), - IActivatedListener(this), m(0) { memset(&t, 0, sizeof(t)); } @@ -159,7 +163,6 @@ public: virtual void OnMouseMove(int id, Evas *e, Evas_Object *obj, Evas_Event_Mouse_Move *ev); virtual void OnRealized(int id, Evas_Object *obj, Elm_Object_Item *item); virtual void OnUnrealized(int id, Evas_Object *obj, Elm_Object_Item *item); - virtual void OnActivated(int id, Evas_Object *obj, Elm_Object_Item *item); }; diff --git a/include/category-songs-layout.h b/include/category-songs-layout.h index 5e22619..7cb286a 100644 --- a/include/category-songs-layout.h +++ b/include/category-songs-layout.h @@ -26,7 +26,6 @@ class CCategorySongsLayout : public IKeyDownListener, public IMouseMoveListener, public IMouseClickedListener, - public IActivatedListener, public IRealizedListener { public: enum EDepth { @@ -97,7 +96,6 @@ public: IKeyDownListener(this), IMouseMoveListener(this), IMouseClickedListener(this), - IActivatedListener(this), IRealizedListener(this), m(0) {} virtual ~CCategorySongsLayout() {} @@ -117,7 +115,6 @@ public: virtual void OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Key_Down *ev); virtual void OnMouseMove(int id, Evas *e, Evas_Object *obj, Evas_Event_Mouse_Move *ev); virtual void OnMouseClicked(int id, Evas_Object *obj); - virtual void OnActivated(int id, Evas_Object *obj, Elm_Object_Item *item); virtual void OnRealized(int id, Evas_Object *obj, Elm_Object_Item *item); }; diff --git a/include/folder-layout.h b/include/folder-layout.h index 27d7447..fe1c881 100644 --- a/include/folder-layout.h +++ b/include/folder-layout.h @@ -20,10 +20,14 @@ struct SFolderItemInfo; -class CFolderLayout : public CExtBaseLayout, public CListenerMgr, - public IMouseMoveListener, public IMouseClickedListener, - public IRealizedListener, public IUnrealizedListener, - public IKeyDownListener, public IActivatedListener { +class CFolderLayout : + public CExtBaseLayout, + public CListenerMgr, + public IMouseMoveListener, + public IMouseClickedListener, + public IRealizedListener, + public IUnrealizedListener, + public IKeyDownListener { private: struct SFolderLayout *m; @@ -69,7 +73,6 @@ public: IRealizedListener(this), IUnrealizedListener(this), IKeyDownListener(this), - IActivatedListener(this), m(0) {} virtual ~CFolderLayout() {} @@ -85,7 +88,6 @@ public: virtual void OnRealized(int id, Evas_Object *obj, Elm_Object_Item *item); virtual void OnUnrealized(int id, Evas_Object *obj, Elm_Object_Item *item); virtual void OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Key_Down *ev); - virtual void OnActivated(int id, Evas_Object *obj, Elm_Object_Item *item); }; diff --git a/include/song-layout.h b/include/song-layout.h index 363f1e3..fd833bf 100644 --- a/include/song-layout.h +++ b/include/song-layout.h @@ -25,7 +25,6 @@ class CSongLayout : public CListenerMgr, public IKeyDownListener, public IMouseMoveListener, - public IActivatedListener, public IRealizedListener { private: struct SSongLayout *m; @@ -70,7 +69,6 @@ public: CExtBaseLayout(pLayoutId), IKeyDownListener(this), IMouseMoveListener(this), - IActivatedListener(this), IRealizedListener(this), m(0) {} virtual ~CSongLayout() {} @@ -84,7 +82,6 @@ public: public: virtual void OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Key_Down *ev); virtual void OnMouseMove(int id, Evas *e, Evas_Object *obj, Evas_Event_Mouse_Move *ev); - virtual void OnActivated(int id, Evas_Object *obj, Elm_Object_Item *item); virtual void OnRealized(int id, Evas_Object *obj, Elm_Object_Item *item); }; diff --git a/src/views/album-layout.cpp b/src/views/album-layout.cpp index b4229d1..caa87aa 100644 --- a/src/views/album-layout.cpp +++ b/src/views/album-layout.cpp @@ -350,7 +350,7 @@ void CAlbumLayout::m_CreateAlbumGrid(void) EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_gengrid_align_set(grid, 0, 0); elm_object_part_content_set(Layout(), MUSIC_PART_ALBUM_GRID, grid); - Connect(grid, ALBUM_GENGRID, TYPE_MOUSE_MOVE | TYPE_KEY_DOWN | TYPE_REALIZED | TYPE_UNREALIZED | TYPE_ACTIVATED); + Connect(grid, ALBUM_GENGRID, TYPE_MOUSE_MOVE | TYPE_KEY_DOWN | TYPE_REALIZED | TYPE_UNREALIZED); elm_gengrid_item_size_set(grid, elm_config_scale_get() * GENGRID_ITEM_SIZE_W, elm_config_scale_get() * GENGRID_ITEM_SIZE_H); @@ -735,16 +735,3 @@ void CAlbumLayout::OnUnrealized(int id, Evas_Object *obj, Elm_Object_Item *item) break; } } - - -void CAlbumLayout::OnActivated(int id, Evas_Object *obj, Elm_Object_Item *item) -{ - switch (id) { - case ALBUM_GENGRID: - m_OnItemSelect(item, NULL, NULL); - break; - - default: - break; - } -} \ No newline at end of file diff --git a/src/views/album-songs-layout.cpp b/src/views/album-songs-layout.cpp index a17139d..3708865 100644 --- a/src/views/album-songs-layout.cpp +++ b/src/views/album-songs-layout.cpp @@ -503,7 +503,7 @@ void CAlbumSongsLayout::m_CreateSongList(void) EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_object_part_content_set(layout, MUSIC_PART_SONGLIST, genlist); Connect(genlist, ALBUM_SONGS_GENLIST, TYPE_MOUSE_MOVE | TYPE_KEY_DOWN | - TYPE_ACTIVATED | TYPE_REALIZED); + TYPE_REALIZED); m->songlist = genlist; list_item = elm_genlist_item_class_new(); @@ -798,19 +798,6 @@ void CAlbumSongsLayout::OnMouseClicked(int id, Evas_Object *obj) } -void CAlbumSongsLayout::OnActivated(int id, Evas_Object *obj, Elm_Object_Item *item) -{ - switch (id) { - case ALBUM_SONGS_GENLIST: - m_OnItemSelect(obj, item); - break; - - default: - break; - } -} - - void CAlbumSongsLayout::OnRealized(int id, Evas_Object *obj, Elm_Object_Item *item) { int index; diff --git a/src/views/category-layout.cpp b/src/views/category-layout.cpp index b208815..bdfc873 100644 --- a/src/views/category-layout.cpp +++ b/src/views/category-layout.cpp @@ -745,7 +745,7 @@ Evas_Object *CCategoryLayout::m_AddGrid(void) EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_gengrid_align_set(grid, 0, 0); - Connect(grid, CATEGORY_LAYOUT_GENGRID, TYPE_MOUSE_MOVE | TYPE_KEY_DOWN | TYPE_REALIZED | TYPE_UNREALIZED | TYPE_ACTIVATED); + Connect(grid, CATEGORY_LAYOUT_GENGRID, TYPE_MOUSE_MOVE | TYPE_KEY_DOWN | TYPE_REALIZED | TYPE_UNREALIZED); elm_gengrid_item_size_set(grid, elm_config_scale_get() * GENGRID_ITEM_SIZE_W, @@ -1516,16 +1516,3 @@ void CCategoryLayout::OnUnrealized(int id, Evas_Object *obj, Elm_Object_Item *it break; } } - - -void CCategoryLayout::OnActivated(int id, Evas_Object *obj, Elm_Object_Item *item) -{ - switch (id) { - case CATEGORY_LAYOUT_GENGRID: - m_OnItemSelect(item, NULL, NULL); - break; - - default: - break; - } -} \ No newline at end of file diff --git a/src/views/category-songs-layout.cpp b/src/views/category-songs-layout.cpp index 609eb3c..00711bf 100644 --- a/src/views/category-songs-layout.cpp +++ b/src/views/category-songs-layout.cpp @@ -735,7 +735,7 @@ void CCategorySongsLayout::m_CreateSongList(void) EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_object_part_content_set(layout, MUSIC_PART_SONGLIST, genlist); Connect(genlist, CATEGORY_SONGS_GENLIST, TYPE_MOUSE_MOVE | TYPE_KEY_DOWN | - TYPE_ACTIVATED | TYPE_REALIZED); + TYPE_REALIZED); m->songlist = genlist; } @@ -1252,24 +1252,6 @@ void CCategorySongsLayout::OnMouseClicked(int id, Evas_Object *obj) } -void CCategorySongsLayout::OnActivated(int id, Evas_Object *obj, Elm_Object_Item *item) -{ - switch (id) { - case CATEGORY_SONGS_GENLIST: - if (m->depth == DEPTH_SELECT_LIST) { - m_OnSelectlistItemSelect(obj, item); - } - else { - m_OnSongItemSelect(obj, item); - } - break; - - default: - break; - } -} - - void CCategorySongsLayout::OnRealized(int id, Evas_Object *obj, Elm_Object_Item *item) { switch (id) { diff --git a/src/views/folder-layout.cpp b/src/views/folder-layout.cpp index 6471d2a..65822e4 100644 --- a/src/views/folder-layout.cpp +++ b/src/views/folder-layout.cpp @@ -549,7 +549,7 @@ void CFolderLayout::m_CreateFolderGrid(void) elm_object_part_content_set(Layout(), MUSIC_PART_FOLDER_GRID, grid); Connect(grid, FOLDER_LAYOUT_GENGRID, TYPE_MOUSE_MOVE | TYPE_KEY_DOWN | - TYPE_REALIZED | TYPE_UNREALIZED | TYPE_ACTIVATED); + TYPE_REALIZED | TYPE_UNREALIZED); elm_gengrid_item_size_set(grid, elm_config_scale_get() * GENGRID_ITEM_SIZE_W, elm_config_scale_get() * GENGRID_ITEM_SIZE_H); @@ -1053,16 +1053,3 @@ void CFolderLayout::OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Key_ break; } } - - -void CFolderLayout::OnActivated(int id, Evas_Object *obj, Elm_Object_Item *item) -{ - switch (id) { - case FOLDER_LAYOUT_GENGRID: - m_OnItemSelect(item, NULL, NULL); - break; - - default: - break; - } -} \ No newline at end of file diff --git a/src/views/song-layout.cpp b/src/views/song-layout.cpp index faaddf3..4283548 100644 --- a/src/views/song-layout.cpp +++ b/src/views/song-layout.cpp @@ -484,7 +484,7 @@ void CSongLayout::m_CreateSongList(void) EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_object_part_content_set(Layout(), MUSIC_PART_SONGLIST, genlist); Connect(genlist, SONG_LAYOUT_GENLIST, TYPE_MOUSE_MOVE | TYPE_KEY_DOWN | - TYPE_ACTIVATED | TYPE_REALIZED); + TYPE_REALIZED); m->songlist = genlist; list_item = elm_genlist_item_class_new(); @@ -709,19 +709,6 @@ void CSongLayout::OnMouseMove(int id, Evas *e, Evas_Object *obj, Evas_Event_Mous } -void CSongLayout::OnActivated(int id, Evas_Object *obj, Elm_Object_Item *item) -{ - switch (id) { - case SONG_LAYOUT_GENLIST: - m_OnItemSelect(obj, item); - break; - - default: - break; - } -} - - void CSongLayout::OnRealized(int id, Evas_Object *obj, Elm_Object_Item *item) { int index; -- 2.7.4