devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=609fa7100d9f0f2f91c1a352c96a3ec99e6c1dca
commit 609fa7100d9f0f2f91c1a352c96a3ec99e6c1dca Author: Chris Michael <cp.mich...@samsung.com> Date: Thu Jun 25 09:30:59 2015 -0400 wl-desktop-shell: Fix formatting Signed-off-by: Chris Michael <cp.mich...@samsung.com> --- src/modules/wl_desktop_shell/e_mod_main.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/modules/wl_desktop_shell/e_mod_main.c b/src/modules/wl_desktop_shell/e_mod_main.c index 022a1bf..b080cd6 100644 --- a/src/modules/wl_desktop_shell/e_mod_main.c +++ b/src/modules/wl_desktop_shell/e_mod_main.c @@ -449,11 +449,13 @@ _e_shell_surface_configure(struct wl_resource *resource, Evas_Coord x, Evas_Coor (ec->netwm.type == E_WINDOW_TYPE_DROPDOWN_MENU)) { x = E_CLAMP(ec->parent->client.x + ec->comp_data->popup.x, - ec->parent->client.x, - ec->parent->client.x + ec->parent->client.w - ec->client.w); + ec->parent->client.x, + ec->parent->client.x + + ec->parent->client.w - ec->client.w); y = E_CLAMP(ec->parent->client.y + ec->comp_data->popup.y, - ec->parent->client.y, - ec->parent->client.y + ec->parent->client.h - ec->client.h); + ec->parent->client.y, + ec->parent->client.y + + ec->parent->client.h - ec->client.h); } } @@ -628,8 +630,8 @@ _e_xdg_shell_surface_configure_send(struct wl_resource *resource, uint32_t edges if (ec->netwm.type != E_WINDOW_TYPE_POPUP_MENU) { - serial = wl_display_next_serial(e_comp->wl_comp_data->wl.disp); - xdg_surface_send_configure(resource, width, height, &states, serial); + serial = wl_display_next_serial(e_comp->wl_comp_data->wl.disp); + xdg_surface_send_configure(resource, width, height, &states, serial); } wl_array_release(&states); --