Merge lp:~gue5t/midori/gtk3-file-types into lp:midori

[gue5t gue5t]

fix illegible (3-char-wide) filetype column in "file types" preference pane under GTK3 to sane initial size and make it grow with the window

Right now under GTK3 the "file type" column of the "Filetypes" preference pane is ellipsized to three characters wide and can't be read. It doesn't grow if the preferences window is enlarged, so there's no way to read the ellipsized content.

This fixes both bugs, and makes the column grow like the application column. This improves GTK2 as well where the longest filetypes were ellipsized and couldn't be read in any fashion; now the window can be enlarged to read them and the extra space is split between the two text columns.

[Cris Dywan (kalikiana)]

Nice tweak. Figuring out the desired mechanics of cell renderers always seems a bit arbitrary so glad that it works, but I won't claim that it makes sense to me.

review: Approve

=== modified file 'extensions/open-with.vala'
--- extensions/open-with.vala	2015-07-18 05:56:02 +0000
+++ extensions/open-with.vala	2016-02-17 20:36:51 +0000
@@ -489,6 +489,7 @@
             column.set_sizing (Gtk.TreeViewColumnSizing.AUTOSIZE);
             Gtk.CellRendererText renderer_type_text = new Gtk.CellRendererText ();
             column.pack_start (renderer_type_text, true);
+            column.set_expand (true);
             column.set_cell_data_func (renderer_type_text, on_render_type_text);
             treeview.append_column (column);
 
@@ -559,9 +560,8 @@
                     desc, mime_type),
 #if HAVE_GTK3
                           "max-width-chars", 30,
-#else
+#endif
                           "width-chars", 30,
-#endif
                           "ellipsize", Pango.EllipsizeMode.END);
         }
 
@@ -582,6 +582,10 @@
             AppInfo app_info;
             model.get (iter, 1, out app_info);
             renderer.set ("markup", describe_app_info (app_info),
+#if HAVE_GTK3
+                          "max-width-chars", 30,
+#endif
+                          "width-chars", 30,
                           "ellipsize", Pango.EllipsizeMode.END);
         }