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

elm_genlist: fix highlighted items overlap with group item during scrolling and focus when intersect. 

Summary: Highlighted genlist item overlap with group item during scrolling and focus when itersect.

Test Plan:
Run elementary_test.
	   open Genlist Group.
	   select one item and try to cross the group item via scrolling.
	   Highlighted item comes over group item.

Reviewers: Hermet, raster, cedric

Reviewed By: cedric

Subscribers: rajeshps, govi, poornima.srinivasan, shilpasingh

Differential Revision: https://phab.enlightenment.org/D2640

Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
This commit is contained in:
Prince Kr Dubey 2015-06-22 11:54:53 +02:00 committed by Cedric BAIL
parent cc2fac3551
commit cbb9985b9b
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
legacy/elementary/src/lib/elm_genlist.c
View File

@ -1772,7 +1772,15 @@ _item_realize(Elm_Gen_Item *it,
focus_raise = edje_object_data_get(VIEW(it), "focusraise");
if ((focus_raise) && (!strcmp(focus_raise, "on")))
evas_object_raise(VIEW(it));
{
Elm_Gen_Item *git;
Eina_List *l;
evas_object_raise(VIEW(it));
EINA_LIST_FOREACH(sd->group_items, l, git)
{
if (git->realized) evas_object_raise(VIEW(git));
}
}
_elm_widget_item_highlight_in_theme(WIDGET(it), EO_OBJ(it));
_elm_widget_highlight_in_theme_update(WIDGET(it));
@ -2359,10 +2367,6 @@ _elm_genlist_pan_evas_object_smart_calculate(Eo *obj, Elm_Genlist_Pan_Data *psd)
evas_object_geometry_get(obj, &ox, &oy, &ow, &oh);
evas_output_viewport_get(evas_object_evas_get(obj), &cvx, &cvy, &cvw, &cvh);
EINA_LIST_FOREACH(sd->group_items, l, git)
{
git->item->want_realize = EINA_FALSE;
}
if (sd->tree_effect_enabled &&
(sd->move_effect_mode != ELM_GENLIST_TREE_EFFECT_NONE))
@ -2428,6 +2432,12 @@ _elm_genlist_pan_evas_object_smart_calculate(Eo *obj, Elm_Genlist_Pan_Data *psd)
if (sd->focused_item && !sd->item_loop_enable)
_elm_widget_focus_highlight_start(psd->wobj);
EINA_LIST_FOREACH(sd->group_items, l, git)
{
git->item->want_realize = EINA_FALSE;
if (git->realized) evas_object_raise(VIEW(git));
}
evas_event_thaw(evas_object_evas_get(obj));
evas_event_thaw_eval(evas_object_evas_get(obj));
}
@ -2623,7 +2633,15 @@ _elm_genlist_item_focused(Elm_Object_Item *eo_it)
focus_raise = edje_object_data_get(VIEW(it), "focusraise");
if ((focus_raise) && (!strcmp(focus_raise, "on")))
evas_object_raise(VIEW(it));
{
Elm_Gen_Item *git;
Eina_List *l;
evas_object_raise(VIEW(it));
EINA_LIST_FOREACH(sd->group_items, l, git)
{
if (git->realized) evas_object_raise(VIEW(git));
}
}
}
evas_object_smart_callback_call(obj, SIG_ITEM_FOCUSED, eo_it);
if (_elm_config->atspi_mode)