diff options
author | Matthias Clasen <mclasen@redhat.com> | 2013-05-12 20:47:55 -0400 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2013-05-12 21:01:59 -0400 |
commit | 759f223396301031a5d4834773e5ed2fbb4584a2 (patch) | |
tree | 7bf79f9aed55f4d07a379bba44815cfe798588a3 | |
parent | 6b50045f9084b1da334b04c10b4fd2b23692f5e7 (diff) | |
download | gtk+-759f223396301031a5d4834773e5ed2fbb4584a2.tar.gz |
csd: Manage visibility of custom titlebars
We should hide custom titlebars when in fullscreen mode, just
as we do for non-custom titlebars.
https://bugzilla.gnome.org/show_bug.cgi?id=700053
-rw-r--r-- | gtk/gtkwindow.c | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 710497fd8a..8203a9ed9c 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -5019,16 +5019,27 @@ update_window_buttons (GtkWindow *window) GtkWindowPrivate *priv = window->priv; gboolean maximized; - if (priv->custom_title) + if (priv->title_box == NULL) return; maximized = gtk_window_get_maximized (window); + if (priv->fullscreen || + (maximized && priv->hide_titlebar_when_maximized)) + { + gtk_widget_hide (priv->title_box); + return; + } + else + { + gtk_widget_show (priv->title_box); + } + + if (priv->custom_title) + return; + if (priv->decorated && - priv->client_decorated && - !priv->fullscreen && - !(maximized && priv->hide_titlebar_when_maximized) && - priv->title_box != NULL) + priv->client_decorated) { gchar *layout_desc; gchar **tokens, **t; @@ -5150,13 +5161,6 @@ update_window_buttons (GtkWindow *window) g_strfreev (tokens); } g_free (layout_desc); - - gtk_widget_show (priv->title_box); - } - else - { - if (priv->title_box != NULL) - gtk_widget_hide (priv->title_box); } } |