Merge lp:~jeremywootten/pantheon-files/fix-1027319 into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Fixes bug 1027319 by imposing a minimum width on the marlin-places-sidebar.

Fixes bug 1027319 by imposing a minimum width on the marlin-places-sidebar,thereby circumventing problems with rendering this widget with very small width. The optimum minimum width needs to be agreed. I have set it to 96, which is wide enough for the category headers to not to be truncated. This value is set by a new key in the org.pantheon.files.preferences schema.

[Cody Garver (codygarver)]

I can confirm this fixes that crash. We just need to hear from design team about the min width value.

review: Approve

[Danielle Foré (danrabbit)]

review: Approve

=== modified file 'schemas/org.pantheon.files.gschema.xml'
--- schemas/org.pantheon.files.gschema.xml	2013-06-01 20:18:10 +0000
+++ schemas/org.pantheon.files.gschema.xml	2013-06-20 20:25:31 +0000
@@ -95,6 +95,11 @@
       <summary>Width of the side pane</summary>
       <description>The default width of the side pane in new windows.</description>
     </key>
+    <key type="i" name="minimum-sidebar-width">
+      <default>96</default>
+      <summary>Minimum width of the side pane</summary>
+      <description>The minimum width of the side pane.</description>
+    </key>
     <key type="b" name="confirm-trash">
       <default>true</default>
       <summary>Confirm trash</summary>

=== modified file 'src/marlin-places-sidebar.c'
--- src/marlin-places-sidebar.c	2013-05-27 22:20:15 +0000
+++ src/marlin-places-sidebar.c	2013-06-20 20:25:31 +0000
@@ -2851,6 +2851,10 @@
 
     /* tree view */
     tree_view = GTK_TREE_VIEW (gtk_tree_view_new ());
+    
+    /*stop side-bar being shrunk too small, which causes a crash*/
+    gtk_widget_set_size_request (tree_view, g_settings_get_int (settings, "minimum-sidebar-width"), -1);
+    
     gtk_tree_view_set_headers_visible (tree_view, FALSE);
 
     col = GTK_TREE_VIEW_COLUMN (gtk_tree_view_column_new ());