summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPekka Paalanen <pekka.paalanen@collabora.co.uk>2016-12-20 14:01:42 +0200
committerPekka Paalanen <pekka.paalanen@collabora.co.uk>2017-01-18 13:42:04 +0200
commit83626b95af132ab28de35f98b0091994af4023bf (patch)
treec75755a2bbf69fcbe2afa3c84af92514870d9e01
parentaabf43d03d4fe30cf22cfdd83d304414c577cbff (diff)
xwm: move fini near init in set_pending_state
Move the region fini just above the region init. They are a pair and belong togeether. Split a long line. Reads better this way. No functional changes. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Daniel Stone <daniels@collabora.com>
-rw-r--r--xwayland/window-manager.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/xwayland/window-manager.c b/xwayland/window-manager.c
index 76d5ab21..e876de62 100644
--- a/xwayland/window-manager.c
+++ b/xwayland/window-manager.c
@@ -1177,8 +1177,6 @@ weston_wm_window_set_pending_state(struct weston_wm_window *window)
window->height + 2);
}
- pixman_region32_fini(&window->surface->pending.input);
-
if (window->decorate && !window->fullscreen) {
frame_input_rect(window->frame, &input_x, &input_y,
&input_w, &input_h);
@@ -1192,11 +1190,13 @@ weston_wm_window_set_pending_state(struct weston_wm_window *window)
wm_log("XWM: win %d geometry: %d,%d %dx%d\n",
window->id, input_x, input_y, input_w, input_h);
+ pixman_region32_fini(&window->surface->pending.input);
pixman_region32_init_rect(&window->surface->pending.input,
input_x, input_y, input_w, input_h);
xwayland_interface->set_window_geometry(window->shsurf,
- input_x, input_y, input_w, input_h);
+ input_x, input_y,
+ input_w, input_h);
if (window->name)
xwayland_interface->set_title(window->shsurf, window->name);
if (window->pid > 0)