From 6371404c13c1f2b09193f418d80d7cdcaa968ebc Mon Sep 17 00:00:00 2001 From: Rafael Antognolli Date: Mon, 29 Apr 2013 11:25:02 -0300 Subject: [PATCH] elm/wayland: Move the frame object to -fx, -fy. It is not a special object anymore, and does not need special handling. Just move it to the correct position, since the canvas 0,0 point now has an offset. --- legacy/elementary/src/lib/elm_win.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/legacy/elementary/src/lib/elm_win.c b/legacy/elementary/src/lib/elm_win.c index 0f1ac17ed2..cf6c544ab1 100644 --- a/legacy/elementary/src/lib/elm_win.c +++ b/legacy/elementary/src/lib/elm_win.c @@ -610,10 +610,11 @@ _elm_win_resize_job(void *data) if (sd->frame_obj) { - int fw, fh; + int fx, fy, fw, fh; - evas_output_framespace_get(sd->evas, NULL, NULL, &fw, &fh); + evas_output_framespace_get(sd->evas, &fx, &fy, &fw, &fh); evas_object_resize(sd->frame_obj, w + fw, h + fh); + evas_object_move(sd->frame_obj, -fx, -fy); } evas_object_resize(sd->obj, w, h); @@ -2312,7 +2313,6 @@ _elm_win_frame_add(Elm_Win_Smart_Data *sd, elm_widget_theme_object_set (sd->obj, sd->frame_obj, "border", "base", style); - evas_object_is_frame_object_set(sd->frame_obj, EINA_TRUE); evas_object_move(sd->frame_obj, 0, 0); evas_object_resize(sd->frame_obj, 1, 1);