brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

theme: Don't add invisible borders for windows that can't be resized

Browse Source 
Invisible borders are all about resizing -- in the case that a window
cannot be resized, it makes no sense to add them.

https://bugzilla.gnome.org/show_bug.cgi?id=659854
This commit is contained in:
Jasper St. Pierre 2011-09-22 14:52:10 -04:00
parent 1b4dce6f84
commit be9f7d7729
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/ui/theme.c
View File

@ -406,6 +406,12 @@ meta_frame_layout_get_borders (const MetaFrameLayout *layout,
{ {
int buttons_height, title_height, draggable_borders; int buttons_height, title_height, draggable_borders;
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); g_return_if_fail (layout != NULL);
if (!layout->has_title) if (!layout->has_title)
@ -417,33 +423,29 @@ meta_frame_layout_get_borders (const MetaFrameLayout *layout,
layout->title_vertical_pad + layout->title_vertical_pad +
layout->title_border.top + layout->title_border.bottom; layout->title_border.top + layout->title_border.bottom;
borders->visible.top = MAX (buttons_height, title_height); borders->visible.top = MAX (buttons_height, title_height);
borders->visible.left = layout->left_width; borders->visible.left = layout->left_width;
borders->visible.right = layout->right_width; borders->visible.right = layout->right_width;
borders->visible.bottom = layout->bottom_height; borders->visible.bottom = layout->bottom_height;
if (flags & META_FRAME_FULLSCREEN)
{
meta_frame_borders_clear (borders);
return;
}
draggable_borders = meta_prefs_get_draggable_border_width (); draggable_borders = meta_prefs_get_draggable_border_width ();
borders->invisible.left = MAX (0, draggable_borders - borders->visible.left); if (flags & META_FRAME_ALLOWS_HORIZONTAL_RESIZE)
borders->invisible.right = MAX (0, draggable_borders - borders->visible.right); {
borders->invisible.bottom = MAX (0, draggable_borders - borders->visible.bottom); borders->invisible.left = MAX (0, draggable_borders - borders->visible.left);
borders->invisible.right = MAX (0, draggable_borders - borders->visible.right);
}
/* borders.visible is the height of the *title bar*. We can't do the same if (flags & META_FRAME_ALLOWS_VERTICAL_RESIZE)
* algorithm here, titlebars are expectedly much bigger. Just subtract a couple {
* pixels to get a proper feel. */ borders->invisible.bottom = MAX (0, draggable_borders - borders->visible.bottom);
borders->invisible.top = MAX (0, draggable_borders - 2);
if (type == META_FRAME_TYPE_ATTACHED) /* borders.visible.top is the height of the *title bar*. We can't do the same
borders->invisible.top = 0; * algorithm here, titlebars are expectedly much bigger. Just subtract a couple
* pixels to get a proper feel. */
if (flags & META_FRAME_SHADED) if (type != META_FRAME_TYPE_ATTACHED)
borders->visible.bottom = borders->invisible.bottom = 0; borders->invisible.top = MAX (0, draggable_borders - 2);
}
borders->total.left = borders->invisible.left + borders->visible.left; borders->total.left = borders->invisible.left + borders->visible.left;
borders->total.right = borders->invisible.right + borders->visible.right; borders->total.right = borders->invisible.right + borders->visible.right;