Merge lp:~victored/noise/lp-1315460 into lp:~elementary-apps/noise/trunk

[Victor Martinez]

Space album view items evenly. Fixes lp:1315460

Space album view items evenly. Fixes lp:1315460

[Corentin Noël (tintou)]

It's also resizing the top and bottom margin, I don't think that it should be the case.

review: Needs Fixing

[Victor Martinez (victored)]

Indeed, I'm not a big fan of that either.

There's a technical limitation though. here 'margin' refers to gtk_icon_view_set_margin, and not gtk_widget_set_margin, so we can't do things like margin_left, margin_top, etc.

See: http://bazaar.launchpad.net/~vcs-imports/gtk/trunk/view/head:/gtk/gtkiconview.c#L5973

A solution could be to have a fixed margin, say 24 px, and only compute the spacing between items. I won't be 'even' spacing anymore, but at least it'd be symmetrical

[lp:~victored/noise/lp-1315460]

1601. By Victor Martinez on 2014-05-03

Use fixed vertical and horizontal margin. Only scale spacing between items.

[Victor Martinez (victored)]

I've modified the implementation to use a fixed 'margin'. See lp:~victored/noise/album-view-spacing

I'm not sure which one to go with tbh.

[Danielle Foré (danrabbit)]

Having a fixed outside margin and adjusting spacing between albums sounds solid to me

[Victor Martinez (victored)]

I've deleted the new 'album-view-spacing' branch and pushed the changes here.

The view currently uses a fixed margin of 24px (top margin appears larger due to item shadow rendering), and only modifies the spacing between items.

Please test again.

[lp:~victored/noise/lp-1315460]

1602. By Victor Martinez on 2014-05-03

update comment

[Corentin Noël (tintou)]

This one is better,
To me the row_spacing = ideal_spacing / 2; should be removed

[lp:~victored/noise/lp-1315460]

1603. By Victor Martinez on 2014-05-03

Only resize horizontally. Use fixed vertical spacing

[Victor Martinez (victored)]

Good call.

I agree only re-flowing horizontally looks better. I modified the default vertical spacing to be 12px instead of the default 6px, which makes the view look cluttered with larger horizontal spacing.

Please test / review again.

[Corentin Noël (tintou)]

Yes, I think it's good like this

review: Approve

[lp:~victored/noise/lp-1315460]

1604. By Victor Martinez on 2014-05-03

get rid of unneeded variable

[Victor Martinez (victored)]

Let's go with this then. If you have any suggestions regarding the size of the margin and such, let me know so I can change it.

review: Approve

=== modified file 'src/Widgets/FastView/TileView/TileView.vala'
--- src/Widgets/FastView/TileView/TileView.vala	2013-08-17 04:38:12 +0000
+++ src/Widgets/FastView/TileView/TileView.vala	2014-05-03 20:26:10 +0000
@@ -6,6 +6,8 @@
  */
 
 public class Noise.Widgets.TileView : Gtk.IconView {
+    private const int MIN_HORIZONTAL_SPACING = 12;
+
     private const string STYLESHEET = """
         /* general background color and texture */
         .tile-view {
@@ -60,6 +62,13 @@
     public TileView () {
         pack_start (cell_renderer, false);
         apply_default_theme ();
+
+        // padding needs to be 0 for pixel-perfect even spacing
+        item_padding = 0;
+
+        // use fixed vertical and horizontal margin
+        margin = 24;
+        row_spacing = 12;
     }
 
     private void apply_default_theme () {
@@ -67,4 +76,28 @@
         Granite.Widgets.Utils.set_theming (this, STYLESHEET, "tile-view",
             Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
     }
+
+    public override void size_allocate (Gtk.Allocation alloc) {
+        // This assumes that the width of the sample is the width of every item
+        Gtk.Requisition minimum_size, natural_size;
+        cell_renderer.get_preferred_size (this, out minimum_size, out natural_size);
+        int item_width = minimum_size.width;
+
+        if (item_width <= 0)
+            base.size_allocate (alloc);
+
+        int total_width = alloc.width;
+
+        // Find out how many items fit in a single row
+        double num = total_width + MIN_HORIZONTAL_SPACING - 2 * margin;
+        double denom = item_width + MIN_HORIZONTAL_SPACING;
+        columns = (int) (num / denom);
+
+        // Find ideal column spacing
+        num = total_width - columns * item_width - 2 * margin;
+        denom = columns - 1;
+        column_spacing = (int) (num / denom);
+
+        base.size_allocate (alloc);
+    }
 }