Merge lp:~midori/midori/preferences-headerbar into lp:midori

[Cris Dywan]

Use HeaderBar in preferences dialog

Unmerged revisions

7167. By Cris Dywan on 2017-11-07

Merge lp:~midori/midori/webKit2Gtk3only

7166. By Cris Dywan on 2017-10-05

Use HeaderBar in preferences dialog

=== modified file 'katze/katze-preferences.c'
--- katze/katze-preferences.c	2017-11-07 01:26:47 +0000
+++ katze/katze-preferences.c	2017-11-07 01:26:47 +0000
@@ -71,6 +71,8 @@
     g_free (dialog_title);
 
     #if !HAVE_OSX
+    if (g_strcmp0 (g_getenv ("GTK_CSD"), "1"))
+    {
     gtk_dialog_add_buttons (GTK_DIALOG (preferences),
         GTK_STOCK_HELP, GTK_RESPONSE_HELP,
         NULL);
@@ -80,6 +82,7 @@
     gtk_dialog_add_buttons (GTK_DIALOG (preferences),
         GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
         NULL);
+    }
     #endif
 
     g_object_connect (preferences,
@@ -154,6 +157,16 @@
         priv->toolbar = gtk_stack_switcher_new ();
         gtk_stack_switcher_set_stack (GTK_STACK_SWITCHER (priv->toolbar), GTK_STACK (priv->notebook));
         gtk_widget_set_halign (priv->toolbar, GTK_ALIGN_CENTER);
+        if (!g_strcmp0 (g_getenv ("GTK_CSD"), "1"))
+        {
+            GtkWidget* headerbar = gtk_header_bar_new ();
+            gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (headerbar), TRUE);
+            gtk_header_bar_set_custom_title (GTK_HEADER_BAR (headerbar), priv->toolbar);
+            gtk_widget_show (headerbar);
+            gtk_window_set_titlebar (GTK_WINDOW (preferences), headerbar);
+            gtk_widget_show (priv->toolbar);
+        }
+        else
         gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (preferences))),
                         priv->toolbar, FALSE, FALSE, 0);
     #endif
 
=== modified file 'midori/midori-preferences.c'
--- midori/midori-preferences.c	2015-07-06 21:26:46 +0000
+++ midori/midori-preferences.c	2017-11-07 01:26:47 +0000
@@ -262,6 +262,8 @@
 
     g_object_get (preferences, "transient-for", &parent, NULL);
     icon_name = parent ? gtk_window_get_icon_name (parent) : NULL;
+    if (g_strcmp0 (g_getenv ("GTK_CSD"), "1"))
+    {
     if ((header = sokoke_xfce_header_new (icon_name,
         gtk_window_get_title (GTK_WINDOW (preferences)))))
     {
@@ -269,6 +271,7 @@
         gtk_box_pack_start (GTK_BOX (vbox), header, FALSE, FALSE, 0);
         gtk_widget_show_all (header);
     }
+    }
     _preferences = KATZE_PREFERENCES (preferences);
 
     #define PAGE_NEW(__icon, __label) \