enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

gengrid: Fixed ELM_OBJECT_SELECT_MODE_NONE codes and added more DISPLAY_ONLY check. 

Also made an internal function to check it easily.

@fix
This commit is contained in:
Daniel Juyung Seo 2014-08-22 02:48:29 +09:00
parent 4a398c6ee9
commit fc4a3a840e
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
legacy/elementary/src/lib/elm_gengrid.c
View File

@ -40,8 +40,6 @@
EAPI const char ELM_GENGRID_SMART_NAME[] = "elm_gengrid";
EAPI const char ELM_GENGRID_PAN_SMART_NAME[] = "elm_gengrid_pan";
#define GG_IT(_it) (_it->item)
#define ELM_PRIV_GENGRID_SIGNALS(cmd) \
cmd(SIG_ACTIVATED, "activated", "") \
cmd(SIG_CLICKED_DOUBLE, "clicked,double", "") \
@ -106,6 +104,19 @@ static const Elm_Action key_actions[] = {
{NULL, NULL}
};
static Eina_Bool
_is_no_select(Elm_Gen_Item *it)
{
ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd);
if ((sd->select_mode == ELM_OBJECT_SELECT_MODE_NONE) ||
(sd->select_mode == ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY) ||
(it->select_mode == ELM_OBJECT_SELECT_MODE_NONE) ||
(it->select_mode == ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY))
return EINA_TRUE;
return EINA_FALSE;
}
EOLIAN static Elm_Object_Item *
_elm_gengrid_search_by_text_item_get(Eo *obj EINA_UNUSED,
Elm_Gengrid_Data *sd,
@ -523,10 +534,7 @@ _item_highlight(Elm_Gen_Item *it)
const char *selectraise = NULL;
Elm_Gengrid_Data *sd = GG_IT(it)->wsd;
if ((sd->select_mode == ELM_OBJECT_SELECT_MODE_NONE) ||
(sd->select_mode == ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY) ||
(it->select_mode == ELM_OBJECT_SELECT_MODE_NONE) ||
(it->select_mode == ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY) ||
if (_is_no_select(it) ||
(!sd->highlight) || (it->highlighted) ||
(it->generation < sd->generation))
return;
@ -1543,8 +1551,7 @@ _elm_gengrid_item_focused(Elm_Gen_Item *it)
if (it->generation < sd->generation)
return;
if ((sd->select_mode == ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY) ||
(it->select_mode == ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY) ||
if (_is_no_select(it) ||
(it == (Elm_Gen_Item *)sd->focused_item) ||
(elm_widget_item_disabled_get(it)))
return;
@ -1586,8 +1593,7 @@ _elm_gengrid_item_unfocused(Elm_Gen_Item *it)
if (it->generation < sd->generation)
return;
if ((sd->select_mode == ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY) ||
(it->select_mode == ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY))
if (_is_no_select(it))
return;
if ((!sd->focused_item) ||
@ -3412,10 +3418,7 @@ _item_select(Elm_Gen_Item *it)
Evas_Object *obj = WIDGET(it);
Elm_Gengrid_Data *sd = GG_IT(it)->wsd;
if ((sd->select_mode == ELM_OBJECT_SELECT_MODE_NONE) ||
(sd->select_mode == ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY) ||
(it->select_mode == ELM_OBJECT_SELECT_MODE_NONE) ||
(it->select_mode == ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY) ||
if (_is_no_select(it) ||
(it->generation < sd->generation) ||
(it->decorate_it_set))
return;

5
legacy/elementary/src/lib/elm_widget_gengrid.h
View File

@ -158,12 +158,17 @@ struct _Elm_Gengrid_Pan_Data
* @}
*/
#define GG_IT(_it) (_it->item)
#define ELM_GENGRID_DATA_GET(o, sd) \
Elm_Gengrid_Data * sd = eo_data_scope_get(o, ELM_GENGRID_CLASS)
#define ELM_GENGRID_PAN_DATA_GET(o, sd) \
Elm_Gengrid_Pan_Data * sd = eo_data_scope_get(o, ELM_GENGRID_PAN_CLASS)
#define ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd) \
Elm_Gengrid_Data * sd = GG_IT(it)->wsd
#define ELM_GENGRID_DATA_GET_OR_RETURN(o, ptr) \
ELM_GENGRID_DATA_GET(o, ptr); \
if (EINA_UNLIKELY(!ptr)) \