From e81a175fa1c73f9778bec09b0d88e6d77aa22455 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Mon, 10 Mar 2014 11:35:48 -0400 Subject: [PATCH] clients: Remove unused client-side resize tracking code --- clients/window.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/clients/window.c b/clients/window.c index 3136a7d7..4d40e167 100644 --- a/clients/window.c +++ b/clients/window.c @@ -218,7 +218,6 @@ struct window { struct rectangle min_allocation; struct rectangle pending_allocation; int x, y; - int resize_edges; int redraw_needed; int redraw_task_scheduled; struct task redraw_task; @@ -1363,7 +1362,7 @@ window_get_display(struct window *window) } static void -surface_create_surface(struct surface *surface, int dx, int dy, uint32_t flags) +surface_create_surface(struct surface *surface, uint32_t flags) { struct display *display = surface->window->display; struct rectangle allocation = surface->allocation; @@ -1383,7 +1382,7 @@ surface_create_surface(struct surface *surface, int dx, int dy, uint32_t flags) flags, &allocation); surface->cairo_surface = surface->toysurface->prepare( - surface->toysurface, dx, dy, + surface->toysurface, 0, 0, allocation.width, allocation.height, flags, surface->buffer_transform, surface->buffer_scale); } @@ -1393,8 +1392,6 @@ window_create_main_surface(struct window *window) { struct surface *surface = window->main_surface; uint32_t flags = 0; - int dx = 0; - int dy = 0; if (window->resizing) flags |= SURFACE_HINT_RESIZE; @@ -1402,17 +1399,7 @@ window_create_main_surface(struct window *window) if (window->preferred_format == WINDOW_PREFERRED_FORMAT_RGB565) flags |= SURFACE_HINT_RGB565; - if (window->resize_edges & THEME_LOCATION_RESIZING_LEFT) - dx = surface->server_allocation.width - - surface->allocation.width; - - if (window->resize_edges & THEME_LOCATION_RESIZING_TOP) - dy = surface->server_allocation.height - - surface->allocation.height; - - window->resize_edges = 0; - - surface_create_surface(surface, dx, dy, flags); + surface_create_surface(surface, flags); } int @@ -1684,7 +1671,7 @@ widget_get_cairo_surface(struct widget *widget) if (surface == window->main_surface) window_create_main_surface(window); else - surface_create_surface(surface, 0, 0, 0); + surface_create_surface(surface, 0); } return surface->cairo_surface;