Merge lp:~elementary-dev-community/noise/fix-1089869 into lp:~elementary-apps/noise/trunk

[Cameron Norman]

Change view selector sensitivity to a more consistent state

This changes a couple things about the visibility and sensitivity of the search field and view selector.

1: the view selector is invisible if the list view or grid view is unavailable. This fixes #1089869 because the grid view is not available when the queue, device, et al lists are in use, and the view selector is made invisible.

2: the view selector and search field are invisible on the welcome screen (needs input from elementary UX).

3: the view selector is insensitive if the alert screen is present but the grid and list views are still available.

4: the column mode toggle is never invisible unless the whole view selector is.

[lp:~elementary-dev-community/noise/fix-1089869]

1560. By Cameron Norman on 2014-02-27

nitpick for consistency

[Danielle Foré (danrabbit)]

Hrm, I'm not sure I like having them both removed from the welcome screen. I would expect the search bar and view switcher to be present, but insensitive here since they can be enable for this "Source" (the music library) by adding music.

Removing them when you switch to another source makes sense because there isn't a way to enable them that that source. But, to me, it still feels kind of weird. I think I personally would rather the switcher just becomes insensitive in all cases instead of being completely removed.

review: Needs Fixing

[lp:~elementary-dev-community/noise/fix-1089869]

1561. By Cameron Norman on 2014-03-02

going with insensitive for all situations

[Cameron Norman (cameronnemo)]

So I made those changes. I definitely agree about the welcome screen. I am not so sure about the other sources (for the view selector), though. The user is never going to be able to switch the view in those situations, so I would think it should be invisible. It does look a little strange, I admit.

[Danielle Foré (danrabbit)]

Much better

review: Approve

[Corentin Noël (tintou)]

It's okay for me, let's merge it !

review: Approve

=== modified file 'src/Views/Wrappers/ViewWrapper.vala'
--- src/Views/Wrappers/ViewWrapper.vala	2013-06-26 21:03:16 +0000
+++ src/Views/Wrappers/ViewWrapper.vala	2014-03-02 02:17:58 +0000
@@ -222,28 +222,23 @@
 
         debug ("update_library_window_widgets [%s]", hint.to_string());
 
-        // Insensitive if there's no media to search
-        
-        bool has_media = media_count > 0;
-        App.main_window.searchField.set_sensitive (has_media);
+        // Search field
+        // Insensitive if there's no media to search (applies to ALERT/WELCOME views)
+        App.main_window.searchField.set_sensitive (media_count > 0);
 
-        // Make the view switcher and search box insensitive if the current item
-        // is the welcome screen. The view selector will only be sensitive if both
-        // views are available.
+        // View switcher
+        // Insensitive if the current view is the welcome/alert screen or if both views
+        // are not available (in the queue, device, or playlist sources).
         App.main_window.viewSelector.set_sensitive (has_grid_view && has_list_view
-                                       && current_view != ViewType.ALERT
-                                       && current_view != ViewType.WELCOME);
-
-        bool column_browser_available = false;
-        bool column_browser_visible = false;
-
-        // Sensitive only if the column browser is available
-        column_browser_available = list_view.has_column_browser;
-        if (column_browser_available)
-            column_browser_visible = list_view.column_browser.visible;
-
-        App.main_window.viewSelector.set_column_browser_toggle_visible (column_browser_available);
-        App.main_window.viewSelector.set_column_browser_toggle_active (column_browser_visible);
+                                                    && current_view != ViewType.WELCOME
+                                                    && current_view != ViewType.ALERT);
+
+        // Set active mode to column view if it is visible. We have to ensure
+        // that it is not null because the column_browser is not guaranteed to
+        // exist. This is done separately from below because of ViewSelector's
+        // poor API.
+        App.main_window.viewSelector.set_column_browser_toggle_active (list_view.column_browser != null
+                                                                       && list_view.column_browser.visible);
 
         // select the right view in the view selector if it's one of the three views.
         // The order is important here. The sensitivity set above must be set before this,