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

elm/win: Put framespace set code in a common place. 

A little refactory that hopefully will prevent future mistakes when
changing this code.
This commit is contained in:
Rafael Antognolli 2013-10-29 08:42:41 -02:00
parent d22076681b
commit 14e63d0a71
1 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
legacy/elementary/src/lib/elm_win.c
View File

@ -2199,25 +2199,18 @@ static struct _resize_info _border_corner[4] =
#endif #endif
static void static void
_elm_win_frame_obj_move(void *data, _elm_win_frame_obj_update(Elm_Win_Smart_Data *sd)
Evas *e __UNUSED__,
Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__)
{ {
Elm_Win_Smart_Data *sd;
int fx, fy, fw, fh; int fx, fy, fw, fh;
int ox, oy, ow, oh; int ox, oy, ow, oh;
int sx, sy, sw, sh; int sx, sy, sw, sh;
int x, y, w, h; int x, y, w, h;
if (!(sd = data)) return;
if (!sd->client_obj) return;
evas_object_geometry_get(sd->frame_obj, &fx, &fy, &fw, &fh); evas_object_geometry_get(sd->frame_obj, &fx, &fy, &fw, &fh);
evas_object_geometry_get(sd->client_obj, &ox, &oy, &ow, &oh); evas_object_geometry_get(sd->client_obj, &ox, &oy, &ow, &oh);
evas_object_geometry_get(sd->spacer_obj, &sx, &sy, &sw, &sh); evas_object_geometry_get(sd->spacer_obj, &sx, &sy, &sw, &sh);
evas_output_framespace_get(sd->evas, &x, &y, &w, &h); evas_output_framespace_get(sd->evas, &x, &y, &w, &h);
if ((x != (ox - fx)) || (y != (oy - fy)) || if ((x != (ox - fx)) || (y != (oy - fy)) ||
(w != (fw - ow)) || (h != (fh - oh))) (w != (fw - ow)) || (h != (fh - oh)))
{ {
@ -2230,6 +2223,20 @@ _elm_win_frame_obj_move(void *data,
#endif #endif
} }
static void
_elm_win_frame_obj_move(void *data,
Evas *e __UNUSED__,
Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__)
{
Elm_Win_Smart_Data *sd;
if (!(sd = data)) return;
if (!sd->client_obj) return;
_elm_win_frame_obj_update(sd);
}
static void static void
_elm_win_frame_obj_resize(void *data, _elm_win_frame_obj_resize(void *data,
Evas *e __UNUSED__, Evas *e __UNUSED__,
@ -2237,29 +2244,11 @@ _elm_win_frame_obj_resize(void *data,
void *event_info __UNUSED__) void *event_info __UNUSED__)
{ {
Elm_Win_Smart_Data *sd; Elm_Win_Smart_Data *sd;
int fx, fy, fw, fh;
int ox, oy, ow, oh;
int sx, sy, sw, sh;
int x, y, w, h;
if (!(sd = data)) return; if (!(sd = data)) return;
if (!sd->client_obj) return; if (!sd->client_obj) return;
evas_object_geometry_get(sd->frame_obj, &fx, &fy, &fw, &fh); _elm_win_frame_obj_update(sd);
evas_object_geometry_get(sd->client_obj, &ox, &oy, &ow, &oh);
evas_object_geometry_get(sd->spacer_obj, &sx, &sy, &sw, &sh);
evas_output_framespace_get(sd->evas, &x, &y, &w, &h);
if ((x != (ox - fx)) || (y != (oy - fy)) ||
(w != (fw - ow)) || (h != (fh - oh)))
{
evas_output_framespace_set(sd->evas, (ox - fx), (oy - fy),
(fw - ow), (fh - oh));
}
#ifdef HAVE_ELEMENTARY_WAYLAND
ecore_wl_window_opaque_region_set(sd->wl.win, -fx, -(fy - sy), sw, sh);
#endif
} }
static void static void