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

Elementary: Revert all framespace changes. 

NB: This means elm will be broken in wayland for a while while I sort
out what went wrong in evas.



SVN revision: 76173
This commit is contained in:
Christopher Michael 2012-09-05 07:42:57 +00:00
parent 67b7042c08
commit 0fce46076e
5 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
legacy/elementary/src/lib/elc_naviframe.c
View File

@ -703,17 +703,13 @@ _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 fx, fy;
ELM_NAVIFRAME_DATA_GET(obj, sd);
evas_output_framespace_get(evas_object_evas_get(obj),
&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 + fx, y + fy);
evas_object_move(VIEW(it), x, y);
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;

12
legacy/elementary/src/lib/elm_hover.c
View File

@ -296,17 +296,7 @@ _elm_hover_smart_sizing_eval(Evas_Object *obj)
if (sd->on_del) return;
if (sd->parent)
{
Evas_Coord fx, fy;
evas_output_framespace_get(evas_object_evas_get(obj),
&fx, &fy, NULL, NULL);
evas_object_geometry_get(sd->parent, &x, &y, &w, &h);
x += fx;
y += fy;
}
if (sd->parent) evas_object_geometry_get(sd->parent, &x, &y, &w, &h);
evas_object_geometry_get(obj, &x2, &y2, &w2, &h2);
if (elm_widget_mirrored_get(obj)) ofs_x = w - (x2 - x) - w2;

7
legacy/elementary/src/lib/elm_menu.c
View File

@ -131,7 +131,6 @@ _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 fx, fy;
ELM_MENU_DATA_GET(obj, sd);
@ -143,11 +142,9 @@ _sizing_eval(Evas_Object *obj)
evas_object_geometry_get(sd->location, NULL, NULL, &w_p, &h_p);
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),
&fx, &fy, NULL, NULL);
x_p = sd->xloc - fx;
y_p = sd->yloc - fy;
x_p = sd->xloc;
y_p = sd->yloc;
if (elm_widget_mirrored_get(obj)) x_p -= w_p;

4
legacy/elementary/src/lib/elm_slider.c
View File

@ -589,12 +589,10 @@ _track_move_cb(void *data,
void *event_info __UNUSED__)
{
Evas_Coord x, y;
int fy = 0;
ELM_SLIDER_DATA_GET(data, sd);
evas_object_geometry_get(obj, &x, &y, NULL, NULL);
evas_output_framespace_get(e, NULL, &fy, NULL, NULL);
evas_object_move(sd->popup, x, y - fy);
evas_object_move(sd->popup, x, y);
}
static void

5
legacy/elementary/src/lib/elm_toolbar.c
View File

@ -471,14 +471,11 @@ _resize_cb(void *data,
void *event_info __UNUSED__)
{
Evas_Coord x, y, h;
Evas_Coord fy;
ELM_TOOLBAR_DATA_GET(data, sd);
evas_output_framespace_get(evas_object_evas_get(data),
NULL, &fy, NULL, NULL);
evas_object_geometry_get(data, &x, &y, NULL, &h);
evas_object_move(sd->more, x, (y + h) - fy);
evas_object_move(sd->more, x, y + h);
if (!sd->resize_job)
sd->resize_job = ecore_job_add(_resize_job, data);