AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

csd: Fix non-resizable windows

Browse Source 
For csd override-redirect windows, we don't set up resize handles,
but we were not ignoring the margin in all places, causing some
size calculations to go wrong.
This commit is contained in:
Matthias Clasen 2014-06-10 23:58:27 -04:00
parent a4b0d35649
commit 2d05bf1492
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gtk/gtkwindow.c
View File

@ -6787,9 +6787,12 @@ get_shadow_width (GtkWidget *widget,
shadows = _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BOX_SHADOW);
_gtk_css_shadows_value_get_extents (shadows, &border);
/* ... and compare it to the margin size, which we use for resize grips */
gtk_style_context_get_margin (context, s, &margin);
max_borders (&border, &margin);
if (priv->type != GTK_WINDOW_POPUP)
{
/* ... and compare it to the margin size, which we use for resize grips */
gtk_style_context_get_margin (context, s, &margin);
max_borders (&border, &margin);
}
sum_borders (&d, &border);
max_borders (shadow_width, &d);
@ -7039,7 +7042,9 @@ shape:
* outside the border windows go through
*/
subtract_borders (&window_border, &border);
if (priv->type != GTK_WINDOW_POPUP)
subtract_borders (&window_border, &border);
rect.x = window_border.left;
rect.y = window_border.top;
rect.width = gtk_widget_get_allocated_width (widget) - window_border.left - window_border.right;