kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

list: 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:57:57 +09:00
parent fc4a3a840e
commit 408e334bf6
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
legacy/elementary/src/lib/elm_list.c
View File

@ -78,6 +78,17 @@ static const Elm_Action key_actions[] = {
{NULL, NULL}
};
static Eina_Bool
_is_no_select(Elm_List_Item *it)
{
ELM_LIST_DATA_GET_FROM_ITEM(it, sd);
if ((sd->select_mode == ELM_OBJECT_SELECT_MODE_NONE) ||
(sd->select_mode == ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY))
return EINA_TRUE;
return EINA_FALSE;
}
static inline void
_elm_list_item_free(Elm_List_Item *it)
{
@ -1106,7 +1117,7 @@ _elm_list_item_focused(Elm_List_Item *it)
Evas_Coord x, y, w, h, sx, sy, sw, sh;
const char *focus_raise;
if ((!sd) || (sd->select_mode == ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY) ||
if ((!sd) || _is_no_select(it) ||
(it == (Elm_List_Item *)sd->focused_item))
return;
evas_object_geometry_get(VIEW(it), &x, &y, &w, &h);
@ -1148,7 +1159,7 @@ _elm_list_item_unfocused(Elm_List_Item *it)
(it != (Elm_List_Item *)sd->focused_item))
return;
if (sd->select_mode == ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY)
if (_is_no_select(it))
return;
if (elm_widget_focus_highlight_enabled_get(obj))
@ -1315,8 +1326,7 @@ _item_highlight(Elm_List_Item *it)
obj = WIDGET(it);
ELM_LIST_DATA_GET(obj, sd);
if ((sd->select_mode == ELM_OBJECT_SELECT_MODE_NONE) ||
(sd->select_mode == ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY) ||
if (_is_no_select(it) ||
(it->highlighted) || (it->base.disabled))
return;
@ -1342,7 +1352,7 @@ _item_select(Elm_List_Item *it)
obj = WIDGET(it);
ELM_LIST_DATA_GET(obj, sd);
if (it->base.disabled || (sd->select_mode == ELM_OBJECT_SELECT_MODE_NONE))
if (it->base.disabled || _is_no_select(it))
return;
if (!sd->focus_on_selection_enabled)
{

3
legacy/elementary/src/lib/elm_widget_list.h
View File

@ -94,6 +94,9 @@ struct _Elm_List_Item
#define ELM_LIST_DATA_GET(o, sd) \
Elm_List_Data * sd = eo_data_scope_get(o, ELM_LIST_CLASS)
#define ELM_LIST_DATA_GET_FROM_ITEM(it, sd) \
ELM_LIST_DATA_GET(WIDGET(it), sd)
#define ELM_LIST_DATA_GET_OR_RETURN(o, ptr) \
ELM_LIST_DATA_GET(o, ptr); \
if (EINA_UNLIKELY(!ptr)) \