Merge lp:~3v1n0/gtk/unity-maximized-headerbar-buttons-hide into lp:~ubuntu-desktop/gtk/ubuntugtk3

[Marco Trevisan (Treviño)]

debian/patches/gtk-shell-shows-window-buttons.patch:
  - Hide headerbar window buttons when a window is maximized in Unity

This will work once lp:~3v1n0/unity/gtk-border-radius-support lands, as it depends on the _UNITY_SHELL atom that we don't export yet.

[lp:~3v1n0/gtk/unity-maximized-headerbar-buttons-hide]

506. By Marco Trevisan (Treviño) on 2016-03-10

debian/patches/unity-border-radius.patch:
 - Don't draw window border in unity for any theme. Add unity-csd style class.

507. By Marco Trevisan (Treviño) on 2016-03-10

debian/patches/unity-headerbar-maximized-mode.patch:
  - Hide headerbar window buttons when a window is maximized in Unity

508. By Marco Trevisan (Treviño) on 2016-03-10

debian/patches/unity-headerbar-maximized-mode.patch: hide title label when maximized

509. By Marco Trevisan (Treviño) on 2016-03-10

Merging with lp:~3v1n0/gtk/unity-border-radius-support

510. By Marco Trevisan (Treviño) on 2016-03-10

debian/patches/unity-headerbar-maximized-mode.patch: hide title in unity when maximized

Also, set the toolbar-mode style class also when the headerbar has no window controls

511. By Marco Trevisan (Treviño) on 2016-03-10

debian/patches/unity-headerbar-maximized-mode.patch: hide label on construction if toplevel is maximized

512. By Marco Trevisan (Treviño) on 2016-03-10

debian/patches/unity-headerbar-maximized-mode.patch: only hide title if it matches with the toplevel title

513. By Marco Trevisan (Treviño) on 2016-03-11

debian/patches/unity-headerbar-maximized-mode.patch: use gtk_widget_set_visible

514. By Marco Trevisan (Treviño) on 2016-03-17

Merging with lp:~3v1n0/gtk/unity-border-radius-support

[Allison Karlitskaya (desrt)]

Should we perhaps consider integrating this into the logic in gtkwindow.c about gtk_window_set_hide_titlebar_when_maximized()? The logic here seems to be a little bit inside out with regard to registering for events on the window and then verifying with the window that we are indeed the correct titlebar for receiving these actions, when the window itself knows which one is the real titlebar...

We have a bad history of unexpected things happening when we hide widgets like this... we used to hide GtkMenuBar from dbusmenu and it broke all kinds of things... I can imagine some app code somewhere getting upset because of this.

[lp:~3v1n0/gtk/unity-maximized-headerbar-buttons-hide]

515. By Marco Trevisan (Treviño) on 2016-03-23

Merging with lp:~ubuntu-desktop/gtk/ubuntugtk3

516. By Marco Trevisan (Treviño) on 2016-03-23

debian/patches/unity-headerbar-maximized-mode.patch: hide titlebar if the current headerbar is the window titlebar

[Allison Karlitskaya (desrt)]

This patch looks pretty good now, but as usual, I cannot ACK (nor comment on the debian/ bits).

=== modified file 'debian/changelog'
--- debian/changelog	2016-03-18 18:26:51 +0000
+++ debian/changelog	2016-03-23 16:07:42 +0000
@@ -4,6 +4,8 @@
     - Export windows corners radius as an X11 property in unity (LP: #1516403)
   * debian/patches/unity_rbga_tooltips.patch:
     - Removed as it's now included in the border-radius patch
+  * debian/patches/unity-headerbar-maximized-mode.patch:
+    - Hide headerbar window buttons when a window is maximized in Unity (LP: #1515810)
 
  -- Marco Trevisan (Treviño) <[e-mail]>  Tue, 15 Mar 2016 18:40:42 +0100
 

=== modified file 'debian/patches/series'
--- debian/patches/series	2016-03-15 17:41:31 +0000
+++ debian/patches/series	2016-03-23 16:07:42 +0000
@@ -25,3 +25,4 @@
 0001-gtkwindow-set-transparent-background-color.patch
 ubuntu_fileselector_behaviour.patch
 unity-border-radius.patch
+unity-headerbar-maximized-mode.patch

=== added file 'debian/patches/unity-headerbar-maximized-mode.patch'
--- debian/patches/unity-headerbar-maximized-mode.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/unity-headerbar-maximized-mode.patch	2016-03-23 16:07:42 +0000
@@ -0,0 +1,136 @@
+Description: Hide Headerbar window buttons and title when running in Unity
+ and the window is maximized.
+ Plus define the "toolbar-mode" style class on these maximized bars.
+Author: Marco Trevisan <[e-mail]>
+Bug-Ubuntu: https://launchpad.net/bugs/1515810
+
+Index: gtk+3.0-3.18.8/gtk/gtkheaderbar.c
+===================================================================
+--- gtk+3.0-3.18.8.orig/gtk/gtkheaderbar.c
++++ gtk+3.0-3.18.8/gtk/gtkheaderbar.c
+@@ -31,6 +31,10 @@
+ 
+ #include <string.h>
+ 
++#ifdef GDK_WINDOWING_X11
++#include "x11/gdkx.h"
++#endif
++
+ /**
+  * SECTION:gtkheaderbar
+  * @Short_description: A box with a centered child
+@@ -65,6 +69,7 @@ struct _GtkHeaderBarPrivate
+   GtkWidget *custom_title;
+   gint spacing;
+   gboolean has_subtitle;
++  gboolean unity_environment;
+ 
+   GList *children;
+ 
+@@ -276,6 +281,36 @@ _gtk_header_bar_update_separator_visibil
+     gtk_widget_set_visible (priv->titlebar_end_separator, have_visible_at_end);
+ }
+ 
++static void
++check_title_visibility (GtkHeaderBar *bar)
++{
++  GtkHeaderBarPrivate *priv = gtk_header_bar_get_instance_private (bar);
++  gboolean visible = TRUE;
++
++  if (!priv->title_label)
++    return;
++
++
++  if (priv->unity_environment)
++    {
++      GtkWidget *widget = GTK_WIDGET (bar);
++      GtkWidget *toplevel = gtk_widget_get_toplevel (widget);
++
++      if (GTK_IS_WINDOW (toplevel))
++        {
++          GtkWindow *window = GTK_WINDOW (toplevel);
++
++          if (gtk_window_is_maximized (window) &&
++              gtk_window_get_titlebar (window) == widget)
++            {
++              visible = FALSE;
++            }
++        }
++    }
++
++  gtk_widget_set_visible (priv->title_label, visible);
++}
++
+ void
+ _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar)
+ {
+@@ -307,6 +342,20 @@ _gtk_header_bar_update_window_buttons (G
+     }
+ 
+   priv->titlebar_icon = NULL;
++  window = GTK_WINDOW (gtk_widget_get_toplevel (widget));
++
++  if (priv->unity_environment)
++    {
++      check_title_visibility (bar);
++
++      if (gtk_window_is_maximized (window))
++        {
++          gtk_style_context_add_class (gtk_widget_get_style_context (widget), "toolbar-mode");
++          return;
++        }
++
++      gtk_style_context_remove_class (gtk_widget_get_style_context (widget), "toolbar-mode");
++    }
+ 
+   if (!priv->shows_wm_decorations)
+     return;
+@@ -324,7 +373,6 @@ _gtk_header_bar_update_window_buttons (G
+       layout_desc = g_strdup (priv->decoration_layout);
+     }
+ 
+-  window = GTK_WINDOW (gtk_widget_get_toplevel (widget));
+ 
+   if (!shown_by_shell && gtk_window_get_application (window))
+     menu = gtk_application_get_app_menu (gtk_window_get_application (window));
+@@ -580,6 +628,8 @@ construct_label_box (GtkHeaderBar *bar)
+                                       &priv->subtitle_label);
+   gtk_header_bar_reorder_css_node (bar, GTK_PACK_START, priv->label_box);
+   gtk_widget_set_parent (priv->label_box, GTK_WIDGET (bar));
++
++  check_title_visibility (bar);
+ }
+ 
+ static void
+@@ -1808,6 +1858,22 @@ gtk_header_bar_realize (GtkWidget *widge
+ 
+   GTK_WIDGET_CLASS (gtk_header_bar_parent_class)->realize (widget);
+ 
++#ifdef GDK_WINDOWING_X11
++  GtkHeaderBar *bar;
++  GtkHeaderBarPrivate *priv;
++  GdkScreen *screen;
++
++  bar = GTK_HEADER_BAR (widget);
++  priv = gtk_header_bar_get_instance_private (bar);
++  screen = gtk_widget_get_screen (widget);
++
++  if (GDK_IS_X11_SCREEN (screen))
++    {
++      GdkAtom unity_atom = gdk_atom_intern_static_string ("_UNITY_SHELL");
++      priv->unity_environment = gdk_x11_screen_supports_net_wm_hint (screen, unity_atom);
++    }
++#endif
++
+   settings = gtk_widget_get_settings (widget);
+   g_signal_connect_swapped (settings, "notify::gtk-shell-shows-app-menu",
+                             G_CALLBACK (_gtk_header_bar_update_window_buttons), widget);
+@@ -1856,6 +1922,8 @@ gtk_header_bar_hierarchy_changed (GtkWid
+   if (toplevel)
+     g_signal_connect_after (toplevel, "window-state-event",
+                             G_CALLBACK (window_state_changed), widget);
++
++  check_title_visibility (GTK_HEADER_BAR (widget));
+ }
+ 
+ static void