From: Philipp Zabel Date: Thu, 5 Aug 2010 18:32:32 +0000 (+0200) Subject: Movie list window: add portrait mode handling X-Git-Url: https://vcs.maemo.org/git/?p=cinaest;a=commitdiff_plain;h=266459a3477dbb2fa3bfa0f5c6d7ed76fae49909 Movie list window: add portrait mode handling Reduce the padding a bit to fit 3x3.5 posters in portrait mode. --- diff --git a/src/movie-list-window.vala b/src/movie-list-window.vala index 0765af1..1661859 100644 --- a/src/movie-list-window.vala +++ b/src/movie-list-window.vala @@ -34,6 +34,7 @@ public class MovieListWindow : StackableWindow { private Alignment alignment; private int count; private MovieSource source; + private bool portrait_mode; public MovieListWindow (MovieSource source_) { source = source_; @@ -84,8 +85,11 @@ public class MovieListWindow : StackableWindow { alignment = new Alignment (0.0f, 0.0f, 1.0f, 1.0f); alignment.top_padding = MARGIN_HALF; - alignment.left_padding = MARGIN_DOUBLE; - alignment.right_padding = MARGIN_DOUBLE; + + // Reduced padding in portrait mode to fit 3 posters in width + int padding = portrait_mode ? MARGIN_DEFAULT : MARGIN_DOUBLE; + alignment.left_padding = padding; + alignment.right_padding = padding; alignment.add (vbox); add (alignment); @@ -103,6 +107,7 @@ public class MovieListWindow : StackableWindow { movie_list.movie_activated.connect (on_movie_activated); store.row_deleted.connect (on_row_deleted); store.row_inserted.connect (on_row_inserted); + Gdk.Screen.get_default ().size_changed.connect (on_orientation_changed); store.search_finished.connect (on_search_finished); store.notify["update-running"].connect (on_update_running_changed); @@ -236,11 +241,39 @@ public class MovieListWindow : StackableWindow { return false; } + private void on_orientation_changed (Gdk.Screen screen) { + if (CinaestProgram.orientation.portrait == portrait_mode) + return; + + portrait_mode = CinaestProgram.orientation.portrait; + + // Reduced padding in portrait mode to fit 3 posters in width + int padding = portrait_mode ? MARGIN_DEFAULT : MARGIN_DOUBLE; + alignment.left_padding = padding; + + // Make space for the pannable area's scroll position indicator + if (count > movies_per_screen ()) + padding -= MARGIN_DEFAULT; + alignment.right_padding = padding; + } + private void on_search_finished (int movies) { - if (movies > 6) - alignment.right_padding = MARGIN_DEFAULT; - else - alignment.right_padding = MARGIN_DOUBLE; + int padding = portrait_mode ? MARGIN_DEFAULT : MARGIN_DOUBLE; + + // Make space for the pannable area's scroll position indicator + if (count > movies_per_screen ()) + padding -= MARGIN_DEFAULT; + alignment.right_padding = padding; + } + + private int movies_per_screen () { + if (portrait_mode) { + // 3x3 full posters or 10 full list items + return movie_list.poster_mode ? 9 : 10; + } else { + // 5x2 posters or 6 list items + return movie_list.poster_mode ? 10 : 6; + } } private void on_movie_activated (Movie movie) {