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

simplify wl xdg/shell configure functions 

setting changes.XYZ is generally bad and shouldn't be done. in this case, it was obscuring an infinite render resize loop

 #barrel
This commit is contained in:
Mike Blumenkrantz 2015-01-22 23:43:42 -05:00
parent 01b0f4a85d
commit 1b321567bf
1 changed files with 2 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/modules/wl_desktop_shell/e_mod_main.c
View File

@ -475,26 +475,7 @@ _e_shell_surface_configure(struct wl_resource *resource, Evas_Coord x, Evas_Coor
}
}
if ((ec->client.x != x) || (ec->client.y != y))
{
ec->client.x = x;
ec->client.y = y;
if (ec->frame)
e_comp_object_frame_xy_adjust(ec->frame, x, y, &ec->x, &ec->y);
ec->changes.pos = EINA_TRUE;
}
// if ((ec->client.w != w) || (ec->client.h != h))
{
ec->client.w = w;
ec->client.h = h;
if (ec->frame)
e_comp_object_frame_wh_adjust(ec->frame, w, h, &ec->w, &ec->h);
ec->changes.size = EINA_TRUE;
}
if ((ec->changes.size) || (ec->changes.pos))
EC_CHANGED(ec);
e_client_util_move_resize_without_frame(ec, x, y, w, h);
}
static void
@ -1057,28 +1038,9 @@ _e_xdg_shell_surface_configure(struct wl_resource *resource, Evas_Coord x, Evas_
}
}
if ((ec->client.x != x) || (ec->client.y != y))
{
ec->client.x = x;
ec->client.y = y;
if (ec->frame)
e_comp_object_frame_xy_adjust(ec->frame, x, y, &ec->x, &ec->y);
ec->changes.pos = EINA_TRUE;
}
// if ((ec->client.w != w) || (ec->client.h != h))
{
ec->client.w = w;
ec->client.h = h;
if (ec->frame)
e_comp_object_frame_wh_adjust(ec->frame, w, h, &ec->w, &ec->h);
ec->changes.size = EINA_TRUE;
}
e_client_util_move_resize_without_frame(ec, x, y, w, h);
/* TODO: ack configure ?? */
if ((ec->changes.pos) || (ec->changes.size))
EC_CHANGED(ec);
}
static void