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

clients: Remove unused client-side resize tracking code

Browse Source
This commit is contained in:
Jasper St. Pierre
2014-03-10 11:35:48 -04:00
committed by Kristian Høgsberg
parent b033c5e1d0
commit e81a175fa1
1 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/window.c
+4 -17
View File
@@ -218,7 +218,6 @@ struct window {
struct rectangle min_allocation; struct rectangle min_allocation;
struct rectangle pending_allocation; struct rectangle pending_allocation;
int x, y; int x, y;
int resize_edges;
int redraw_needed; int redraw_needed;
int redraw_task_scheduled; int redraw_task_scheduled;
struct task redraw_task; struct task redraw_task;
@@ -1363,7 +1362,7 @@ window_get_display(struct window *window)
} }
static void 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 display *display = surface->window->display;
struct rectangle allocation = surface->allocation; struct rectangle allocation = surface->allocation;
@@ -1383,7 +1382,7 @@ surface_create_surface(struct surface *surface, int dx, int dy, uint32_t flags)
flags, &allocation); flags, &allocation);
surface->cairo_surface = surface->toysurface->prepare( surface->cairo_surface = surface->toysurface->prepare(
surface->toysurface, dx, dy, surface->toysurface, 0, 0,
allocation.width, allocation.height, flags, allocation.width, allocation.height, flags,
surface->buffer_transform, surface->buffer_scale); surface->buffer_transform, surface->buffer_scale);
} }
@@ -1393,8 +1392,6 @@ window_create_main_surface(struct window *window)
{ {
struct surface *surface = window->main_surface; struct surface *surface = window->main_surface;
uint32_t flags = 0; uint32_t flags = 0;
int dx = 0;
int dy = 0;
if (window->resizing) if (window->resizing)
flags |= SURFACE_HINT_RESIZE; flags |= SURFACE_HINT_RESIZE;
@@ -1402,17 +1399,7 @@ window_create_main_surface(struct window *window)
if (window->preferred_format == WINDOW_PREFERRED_FORMAT_RGB565) if (window->preferred_format == WINDOW_PREFERRED_FORMAT_RGB565)
flags |= SURFACE_HINT_RGB565; flags |= SURFACE_HINT_RGB565;
if (window->resize_edges & THEME_LOCATION_RESIZING_LEFT) surface_create_surface(surface, flags);
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);
} }
int int
@@ -1684,7 +1671,7 @@ widget_get_cairo_surface(struct widget *widget)
if (surface == window->main_surface) if (surface == window->main_surface)
window_create_main_surface(window); window_create_main_surface(window);
else else
surface_create_surface(surface, 0, 0, 0); surface_create_surface(surface, 0);
} }
return surface->cairo_surface; return surface->cairo_surface;