diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2015-08-12 14:39:46 -0700 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2015-08-12 14:40:20 -0700 |
| commit | 968ac90e89f444e180d883a28bfd260b118f451d (patch) | |
| tree | 1bc089950272daae5a85c55142318d2e5d9ec0e5 /gtk/gtkwindow.c | |
| parent | 45d15b302e318f3ba9fed7c5e146152ba0e97de6 (diff) | |
| download | gtk+-968ac90e89f444e180d883a28bfd260b118f451d.tar.gz | |
Revert "Revert "window: fix initial shadow width for maximized/fullscreen windows""
This reverts commit 8b695cc7279270eabf7d2541cfd592608d0add38.
No reason in the commit message was given for the revert, and we need
this for proper behavior on map.
Diffstat (limited to 'gtk/gtkwindow.c')
| -rw-r--r-- | gtk/gtkwindow.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 4e96d6f712..a0b8f126f6 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -6099,6 +6099,8 @@ gtk_window_map (GtkWidget *widget) else gdk_window_unmaximize (gdk_window); + priv->maximize_initially = FALSE; + if (priv->stick_initially) gdk_window_stick (gdk_window); else @@ -6120,6 +6122,8 @@ gtk_window_map (GtkWidget *widget) else gdk_window_unfullscreen (gdk_window); + priv->fullscreen_initially = FALSE; + gdk_window_set_keep_above (gdk_window, priv->above_initially); gdk_window_set_keep_below (gdk_window, priv->below_initially); @@ -6592,7 +6596,9 @@ get_shadow_width (GtkWidget *widget, return; if (priv->maximized || - priv->fullscreen) + priv->maximize_initially || + priv->fullscreen || + priv->fullscreen_initially) return; if (!gtk_widget_is_toplevel (widget)) |