[gnome-terminal/wip/fmuellner/headerbar] prefs: Move action widgets into titlebar when using headerbars

[Florian Müllner <fmuellner src gnome org>]

commit 677b2d355bb876b67ec8027c6bb095143cb1f906
Author: Florian Müllner <fmuellner gnome org>
Date:   Sun Nov 4 14:27:00 2018 +0100

    prefs: Move action widgets into titlebar when using headerbars
    
    For non-message dialogs, that's the preferred placement under GNOME.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=756798

 src/terminal-prefs.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
---
diff --git a/src/terminal-prefs.c b/src/terminal-prefs.c
index f5262650..c17fe193 100644
--- a/src/terminal-prefs.c
+++ b/src/terminal-prefs.c
@@ -798,6 +798,26 @@ terminal_prefs_show_preferences (GSettings *profile, const char *widget_name)
                                    action_entries, G_N_ELEMENTS (action_entries),
                                    data);
 
+  /* Move action widgets to titlebar when headerbar is used */
+  if (terminal_app_get_use_headerbar (app))
+    {
+      GtkWidget *headerbar;
+      GtkWidget *bbox;
+
+      headerbar = g_object_new (GTK_TYPE_HEADER_BAR,
+                                "show-close-button", TRUE, NULL);
+      bbox = gtk_widget_get_parent (close_button);
+
+      gtk_container_remove (GTK_CONTAINER (bbox), g_object_ref (help_button));
+      gtk_header_bar_pack_start (GTK_HEADER_BAR (headerbar), help_button);
+      g_object_unref (help_button);
+
+      gtk_widget_show (headerbar);
+      gtk_widget_hide (bbox);
+
+      gtk_window_set_titlebar (GTK_WINDOW (dialog), headerbar);
+    }
+
   /* Sidebar */
 
   gtk_list_box_set_header_func (GTK_LIST_BOX (data->listbox),