[gtk+] csd: Fix non-resizable windows
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] csd: Fix non-resizable windows
- Date: Wed, 11 Jun 2014 11:31:03 +0000 (UTC)
commit 2d05bf1492c6448df98ecf04c913a33df665ca34
Author: Matthias Clasen <mclasen redhat com>
Date: Tue Jun 10 23:58:27 2014 -0400
csd: Fix non-resizable windows
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.
gtk/gtkwindow.c | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 2db3015..39d3a68 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -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;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]