Merge lp:~gue5t/midori/wide-prefs into lp:midori

[gue5t gue5t]

Work around GTK3's hard-coded minimum stackswitcher button width

GTK hard-codes a 100px width on stackswitcher buttons, which with the addition of the file-type tab to preferences results in a very wide preferences dialog for no good reason. This patch resets the size-request so themes can control sizing and so we don't unnecessarily waste space.

[gue5t gue5t (gue5t)]

See the bug (<https://bugs.launchpad.net/midori/+bug/1292666>) for before/after pictures.

[lp:~gue5t/midori/wide-prefs]

6598. By gue5t <email address hidden> on 2014-03-14

Cosmetic cleanups

6599. By gue5t <email address hidden> on 2014-03-14

Rename workaround function

[Cody Garver (codygarver)]

The problem is not Gtk's padding, it's that there are way too many options

[gue5t gue5t (gue5t)]

> The problem is not Gtk's padding, it's that there are way too many options

I'd say they're both problems, but until we design something better we should have our current (flawed) design at least display as intended; gtk_container_set_homogeneous should be used if we want the switcher buttons to be of equal size, and CSS should be used if we want them to be at least a certain width.

In IRC we discussed alternative UI a little bit, ranging from a KDE/Gimp-style list of preference categories on the left to making filetypes a sub-dialog, but there wasn't clear direction or consensus. So I would say a redesign would be nice, but this bug is orthogonal to any redesign we'll do.

[Paweł Forysiuk (tuxator)]

Maybe use #if HAVE_STACK_SWITCHER instead of #if GTK_CHECK_VERSION (3, 10, 0) & !HAVE_OSX check?

Otherwise looks good to me.

review: Approve

[Cris Dywan (kalikiana)]

Good catch with the "&" I was confused for a second why it showed up in the diff.

Works well here (actually no visible difference for me).

review: Approve

=== modified file 'katze/katze-preferences.c'
--- katze/katze-preferences.c	2014-02-28 21:37:08 +0000
+++ katze/katze-preferences.c	2014-03-14 19:04:25 +0000
@@ -144,7 +144,7 @@
 {
     KatzePreferencesPrivate* priv = preferences->priv;
     
-    #if GTK_CHECK_VERSION (3, 10, 0) & !HAVE_OSX
+    #if GTK_CHECK_VERSION (3, 10, 0) && !HAVE_OSX
     priv->notebook = gtk_stack_new ();
     #else
     priv->notebook = gtk_notebook_new ();
@@ -160,7 +160,7 @@
     gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (preferences))),
                         priv->toolbar, FALSE, FALSE, 0);
     #else
-    #if GTK_CHECK_VERSION (3, 10, 0) & !HAVE_OSX
+    #if GTK_CHECK_VERSION (3, 10, 0) && !HAVE_OSX
         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);
@@ -200,6 +200,23 @@
     gtk_widget_show_all (gtk_dialog_get_content_area (GTK_DIALOG (preferences)));
 }
 
+#if GTK_CHECK_VERSION (3, 10, 0) & !HAVE_OSX
+/* these functions are used to clear the 100-px width set in GTK3's
+update_button function in gtk/gtkstackswitcher.c */
+
+static void
+clear_size_request (GtkWidget* widget)
+{
+    gtk_widget_set_size_request (widget, -1, -1);
+}
+
+static void
+workaround_stack_switcher_sizing (GtkStackSwitcher* switcher)
+{
+    gtk_container_forall (GTK_CONTAINER (switcher), (GtkCallback)clear_size_request, NULL);
+}
+#endif
+
 /**
  * katze_preferences_add_category:
  * @preferences: a #KatzePreferences instance
@@ -235,6 +252,7 @@
     #if GTK_CHECK_VERSION (3, 10, 0) & !HAVE_OSX
     gtk_stack_add_titled (GTK_STACK (priv->notebook), 
                          priv->page, label, label);
+    workaround_stack_switcher_sizing (GTK_STACK_SWITCHER (priv->toolbar));
     #else
     gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook),
                               priv->page, gtk_label_new (label));