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

window: Don't overwrite window->allocation until we've done the resize

Browse Source 
This way we can actually detect whether or not a window resizes.
This commit is contained in:
Kristian Høgsberg
2012-01-31 15:30:47 -05:00
parent 009ac0a965
commit 0d1c062913
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/window.c
+16 -17
View File
@@ -111,6 +111,7 @@ struct window {
struct wl_shell_surface *shell_surface; struct wl_shell_surface *shell_surface;
char *title; char *title;
struct rectangle allocation, saved_allocation, server_allocation; struct rectangle allocation, saved_allocation, server_allocation;
struct rectangle pending_allocation;
int x, y; int x, y;
int resize_edges; int resize_edges;
int redraw_scheduled; int redraw_scheduled;
@@ -2018,24 +2019,21 @@ window_move(struct window *window, struct input *input, uint32_t time)
} }
static void static void
window_resize(struct window *window, int32_t width, int32_t height) window_resize(struct window *window)
{ {
struct rectangle allocation;
struct widget *widget; struct widget *widget;
allocation.x = 0;
allocation.y = 0;
allocation.width = width;
allocation.height = height;
widget = window->widget; widget = window->widget;
widget_set_allocation(widget, allocation.x, allocation.y, widget_set_allocation(widget,
allocation.width, allocation.height); window->pending_allocation.x,
window->pending_allocation.y,
window->pending_allocation.width,
window->pending_allocation.height);
if (widget->resize_handler) if (widget->resize_handler)
widget->resize_handler(widget, widget->resize_handler(widget,
allocation.width, widget->allocation.width,
allocation.height, widget->allocation.height,
widget->user_data); widget->user_data);
if (window->allocation.width != widget->allocation.width || if (window->allocation.width != widget->allocation.width ||
@@ -2051,17 +2049,19 @@ idle_resize(struct task *task, uint32_t events)
struct window *window = struct window *window =
container_of(task, struct window, resize_task); container_of(task, struct window, resize_task);
window_resize(window, window_resize(window);
window->allocation.width, window->allocation.height);
window->resize_scheduled = 0; window->resize_scheduled = 0;
} }
void void
window_schedule_resize(struct window *window, int width, int height) window_schedule_resize(struct window *window, int width, int height)
{ {
window->pending_allocation.x = 0;
window->pending_allocation.y = 0;
window->pending_allocation.width = width;
window->pending_allocation.height = height;
if (!window->resize_scheduled) { if (!window->resize_scheduled) {
window->allocation.width = width;
window->allocation.height = height;
window->resize_task.run = idle_resize; window->resize_task.run = idle_resize;
display_defer(window->display, &window->resize_task); display_defer(window->display, &window->resize_task);
window->resize_scheduled = 1; window->resize_scheduled = 1;
@@ -2085,8 +2085,7 @@ handle_configure(void *data, struct wl_shell_surface *shell_surface,
return; return;
window->resize_edges = edges; window->resize_edges = edges;
window_schedule_resize(window, width, height);
window_resize(window, width, height);
} }
static void static void