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

gengrid: Fixed the focus animation in horizontal mode 

Summary:
Fixed the focus animation in horizontal mode. Earlier focus was moving
         out of the view port in horizontal mode
         @fix

Reviewers: seoz, raster

CC: seoz, singh.amitesh

Differential Revision: https://phab.enlightenment.org/D693
This commit is contained in:
nirajkr 2014-04-03 19:19:45 +09:00 committed by Carsten Haitzler (Rasterman)
parent 69bdc47081
commit 5fca06cdb7
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3881,9 +3881,9 @@ elm_gengrid_nth_item_get(const Evas_Object *obj, unsigned int nth)
EOLIAN static void EOLIAN static void
_elm_gengrid_elm_widget_focus_highlight_geometry_get(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h, Eina_Bool is_next) _elm_gengrid_elm_widget_focus_highlight_geometry_get(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h, Eina_Bool is_next)
{ {
Evas_Coord ox, oy, oh, item_x = 0, item_y = 0, item_w = 0, item_h = 0; Evas_Coord ox, oy, oh, ow, item_x = 0, item_y = 0, item_w = 0, item_h = 0;
evas_object_geometry_get(obj, &ox, &oy, NULL, &oh); evas_object_geometry_get(obj, &ox, &oy, &ow, &oh);
if (is_next) if (is_next)
{ {
@ -3902,26 +3902,32 @@ _elm_gengrid_elm_widget_focus_highlight_geometry_get(Eo *obj, Elm_Gengrid_Data *
} }
} }
if (item_y < oy) *x = item_x;
*y = item_y;
*w = item_w;
*h = item_h;
if (sd->horizontal)
{ {
*x = item_x; if (item_x < ox)
*y = oy; {
*w = item_w; *x = ox;
*h = item_h; }
} else if (item_x > (ox + ow - item_w))
else if (item_y > (oy + oh - item_h)) {
{ *x = ox + ow - item_w;
*x = item_x; }
*y = oy + oh - item_h;
*w = item_w;
*h = item_h;
} }
else else
{ {
*x = item_x; if (item_y < oy)
*y = item_y; {
*w = item_w; *y = oy;
*h = item_h; }
else if (item_y > (oy + oh - item_h))
{
*y = oy + oh - item_h;
}
} }
} }