mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

window: Move the resize after interpreting the states

Browse Source 
As the protocol says, the states determine how the width and height
arguments should be interpreted, so it makes logical sense to do the
interpretation after.
This commit is contained in:
Jasper St. Pierre
2014-05-06 08:33:27 -04:00
committed by Kristian Høgsberg
parent ccf908b078
commit f184c382e8
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/window.c
+8 -8
View File
@@ -3845,14 +3845,6 @@ handle_surface_configure(void *data, struct xdg_surface *xdg_surface,
struct window *window = data; struct window *window = data;
uint32_t *p; uint32_t *p;
if (width > 0 && height > 0) {
window_schedule_resize(window, width, height);
} else {
window_schedule_resize(window,
window->saved_allocation.width,
window->saved_allocation.height);
}
window->maximized = 0; window->maximized = 0;
window->fullscreen = 0; window->fullscreen = 0;
window->resizing = 0; window->resizing = 0;
@@ -3893,6 +3885,14 @@ handle_surface_configure(void *data, struct xdg_surface *xdg_surface,
} }
} }
if (width > 0 && height > 0) {
window_schedule_resize(window, width, height);
} else {
window_schedule_resize(window,
window->saved_allocation.width,
window->saved_allocation.height);
}
window->next_attach_serial = serial; window->next_attach_serial = serial;
if (window->state_changed_handler) if (window->state_changed_handler)