summaryrefslogtreecommitdiff
path: root/clients
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2014-08-04 13:43:25 -0400
committerJason Ekstrand <jason.ekstrand@intel.com>2014-08-05 12:31:04 -0700
commita177df09bff049385137caa485960d274aa2fbf1 (patch)
tree2d5e51506cbec06f080b5478b8bb3263175b1b3f /clients
parentd8c6aeb8a5f5c5e53fbbf7cfabf85c026b1e4795 (diff)
window: Don't use the frame's geometry when fullscreen
When fullscreen, we don't actually update the frame's geometry, so we can't query it for there.
Diffstat (limited to 'clients')
-rw-r--r--clients/window.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/clients/window.c b/clients/window.c
index 1700cf9e..85e5de82 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -3790,7 +3790,7 @@ widget_schedule_resize(struct widget *widget, int32_t width, int32_t height)
static int
window_get_shadow_margin(struct window *window)
{
- if (window->frame)
+ if (window->frame && !window->fullscreen)
return frame_get_shadow_margin(window->frame->frame);
else
return 0;
@@ -3896,7 +3896,7 @@ window_sync_parent(struct window *window)
static void
window_get_geometry(struct window *window, struct rectangle *geometry)
{
- if (window->frame)
+ if (window->frame && !window->fullscreen)
frame_input_rect(window->frame->frame,
&geometry->x,
&geometry->y,