diff options
| -rw-r--r-- | src/ui/theme.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/ui/theme.c b/src/ui/theme.c index 9a7bf455..c34a7330 100644 --- a/src/ui/theme.c +++ b/src/ui/theme.c @@ -409,6 +409,12 @@ meta_frame_layout_get_borders (const MetaFrameLayout *layout, { int buttons_height, title_height; + meta_frame_borders_clear (borders); + + /* For a full-screen window, we don't have any borders, visible or not. */ + if (flags & META_FRAME_FULLSCREEN) + return; + g_return_if_fail (layout != NULL); if (!layout->has_title) @@ -425,16 +431,17 @@ meta_frame_layout_get_borders (const MetaFrameLayout *layout, borders->visible.right = layout->right_width; borders->visible.bottom = layout->bottom_height; - if (flags & META_FRAME_FULLSCREEN) + if (flags & META_FRAME_ALLOWS_HORIZONTAL_RESIZE) { - meta_frame_borders_clear (borders); - return; + borders->invisible.left = layout->invisible_border.left; + borders->invisible.right = layout->invisible_border.right; } - borders->invisible.left = layout->invisible_border.left; - borders->invisible.right = layout->invisible_border.right; - borders->invisible.bottom = layout->invisible_border.bottom; - borders->invisible.top = layout->invisible_border.top; + if (flags & META_FRAME_ALLOWS_VERTICAL_RESIZE) + { + borders->invisible.bottom = layout->invisible_border.bottom; + borders->invisible.top = layout->invisible_border.top; + } if (flags & META_FRAME_SHADED) borders->visible.bottom = borders->invisible.bottom = 0; |