summaryrefslogtreecommitdiff
path: root/desktop-shell
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2014-07-14 16:28:48 -0400
committerJason Ekstrand <jason.ekstrand@intel.com>2014-07-17 13:58:45 -0700
commitbd65e508753b8c1eeadcaa1c223bace2a3477083 (patch)
tree08c553f795646a20a4c16fe36d2e09e1478f4905 /desktop-shell
parent7b9820766735f3b5184e9795d7945dcdd784a827 (diff)
downloadweston-bd65e508753b8c1eeadcaa1c223bace2a3477083.tar.gz
Interpret the size in the configure event as window geometry
The size of the configure event has always been specified as in window geometry coordinates, but it was never implemented this way.
Diffstat (limited to 'desktop-shell')
-rw-r--r--desktop-shell/shell.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index f22cef8e..fca1c007 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -1832,6 +1832,11 @@ surface_resize(struct shell_surface *shsurf,
surface_subsurfaces_boundingbox(shsurf->surface, NULL, NULL,
&resize->width, &resize->height);
+ resize->width -= shsurf->margin.left;
+ resize->width -= shsurf->margin.right;
+ resize->height -= shsurf->margin.top;
+ resize->height -= shsurf->margin.bottom;
+
shsurf->resize_edges = edges;
shell_surface_state_changed(shsurf);
shell_grab_start(&resize->base, &resize_grab_interface, shsurf,