Make number of file list entries depending on the width for grid view

Signed-off-by: Julius Härtl <jus@bitgrid.net>

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 83510762c1af031b565fc10f7ffde030b1c4905b..94fdada937d7233c29417659ac6aced600062d0f 100644 (file)
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -99,7 +99,14 @@
                 * @return {int} page size
                 */
                pageSize: function() {
-                       return Math.max(Math.ceil(this.$container.height() / 50), 1);
+                       var isGridView = this.$showGridView.is(':checked');
+                       var columns = 1;
+                       var rows = Math.ceil(this.$container.height() / 50);
+                       if (isGridView) {
+                               columns = Math.ceil(this.$container.width() / 160);
+                               rows = Math.ceil(this.$container.height() / 160);
+                       }
+                       return Math.max(columns*rows, columns);
                },
 
                /**