forked from enlightenment/efl
Elm: Account for framespace X also. Thanks for spotting this Daniel ;)
SVN revision: 76129
This commit is contained in:
parent
0c76a14399
commit
30cc66d90d
|
@ -703,17 +703,17 @@ _elm_naviframe_smart_sizing_eval(Evas_Object *obj)
|
|||
Evas_Coord minw = -1, minh = -1;
|
||||
Elm_Naviframe_Item *it;
|
||||
Evas_Coord x, y, w, h;
|
||||
Evas_Coord fy;
|
||||
Evas_Coord fx, fy;
|
||||
|
||||
ELM_NAVIFRAME_DATA_GET(obj, sd);
|
||||
|
||||
evas_output_framespace_get(evas_object_evas_get(obj),
|
||||
NULL, &fy, NULL, NULL);
|
||||
&fx, &fy, NULL, NULL);
|
||||
|
||||
evas_object_geometry_get(obj, &x, &y, &w, &h);
|
||||
EINA_INLIST_FOREACH (sd->stack, it)
|
||||
{
|
||||
evas_object_move(VIEW(it), x, y + fy);
|
||||
evas_object_move(VIEW(it), x + fx, y + fy);
|
||||
evas_object_resize(VIEW(it), w, h);
|
||||
edje_object_size_min_calc(VIEW(it), &it->minw, &it->minh);
|
||||
if (it->minw > minw) minw = it->minw;
|
||||
|
|
|
@ -131,7 +131,7 @@ _sizing_eval(Evas_Object *obj)
|
|||
Eina_List *l;
|
||||
Elm_Menu_Item *item;
|
||||
Evas_Coord x_p, y_p, w_p, h_p, x2, y2, w2, h2, bw, bh;
|
||||
Evas_Coord fy;
|
||||
Evas_Coord fx, fy;
|
||||
|
||||
ELM_MENU_DATA_GET(obj, sd);
|
||||
|
||||
|
@ -144,9 +144,9 @@ _sizing_eval(Evas_Object *obj)
|
|||
evas_object_geometry_get(sd->parent, &x2, &y2, &w2, &h2);
|
||||
evas_object_geometry_get(sd->bx, NULL, NULL, &bw, &bh);
|
||||
evas_output_framespace_get(evas_object_evas_get(sd->bx),
|
||||
NULL, &fy, NULL, NULL);
|
||||
&fx, &fy, NULL, NULL);
|
||||
|
||||
x_p = sd->xloc;
|
||||
x_p = sd->xloc - fx;
|
||||
y_p = sd->yloc - fy;
|
||||
|
||||
if (elm_widget_mirrored_get(obj)) x_p -= w_p;
|
||||
|
|
Loading…
Reference in New Issue