Movie list window: correct calculation of movies per screen

[cinaest] / src / movie-list-window.vala

diff --git a/src/movie-list-window.vala b/src/movie-list-window.vala
index 1661859..5d702ef 100644 (file)
--- a/src/movie-list-window.vala
+++ b/src/movie-list-window.vala
@@ -69,7 +69,7 @@ public class MovieListWindow : StackableWindow {
 
                // Movie list - connected to menu for sorting
                movie_list = new MovieListView (this, source.get_name () == _("Watched movies"));
-               menu.sortable = movie_list.store;
+               menu.store = movie_list.store;
                store = movie_list.store;
                store.source = source;
 
@@ -268,11 +268,17 @@ public class MovieListWindow : StackableWindow {
 
        private int movies_per_screen () {
                if (portrait_mode) {
-                       // 3x3 full posters or 10 full list items
-                       return movie_list.poster_mode ? 9 : 10;
+                       // 3x3 full posters or 10 full list items,
+                       // 10 full list items in list mode without search bar
+                       return (search_bar_visible || movie_list.poster_mode) ? 9 : 10;
                } else {
-                       // 5x2 posters or 6 list items
-                       return movie_list.poster_mode ? 10 : 6;
+                       if (search_bar_visible) {
+                               // 5x1 full posters or 5 list items
+                               return 5;
+                       } else {
+                               // 5x2 posters or 6 list items
+                               return movie_list.poster_mode ? 10 : 6;
+                       }
                }
        }