Merge pull request #3137 from jmbreuer/upstream-sortby

Differentiate between "unsorted" and "unsortable"
xbmc · Sep 27, 2013 · 6db5a2c · 6db5a2c
2 parents 4dfbc05 + a29abf1
commit 6db5a2c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/xbmc/view/GUIViewState.cpp b/xbmc/view/GUIViewState.cpp
@@ -220,6 +220,11 @@ SortDescription CGUIViewState::GetSortMethod() const
   return sorting;
 }
 
+bool CGUIViewState::HasMultipleSortMethods() const
+{
+  return m_sortMethods.size() > 1;
+}
+
 int CGUIViewState::GetSortMethodLabel() const
 {
   if (m_currentSortMethod>=0 && m_currentSortMethod<(int)m_sortMethods.size())
@@ -293,6 +298,7 @@ void CGUIViewState::SetSortMethod(SortBy sortBy, SortAttribute sortAttributes /*
       break;
     }
   }
+  SetSortOrder(m_sortOrder);
 }
 
 void CGUIViewState::SetSortMethod(SortDescription sortDescription)
@@ -308,6 +314,7 @@ SortDescription CGUIViewState::SetNextSortMethod(int direction /* = 1 */)
     m_currentSortMethod = 0;
   if (m_currentSortMethod < 0)
     m_currentSortMethod = m_sortMethods.size() ? (int)m_sortMethods.size() - 1 : 0;
+  SetSortOrder(m_sortOrder);
 
   SaveViewState();
 

diff --git a/xbmc/view/GUIViewState.h b/xbmc/view/GUIViewState.h
@@ -40,6 +40,7 @@ class CGUIViewState
   SortDescription SetNextSortMethod(int direction = 1);
   void SetCurrentSortMethod(int method);
   SortDescription GetSortMethod() const;
+  bool HasMultipleSortMethods() const;
   int GetSortMethodLabel() const;
   void GetSortMethodLabelMasks(LABEL_MASKS& masks) const;
 

diff --git a/xbmc/windows/GUIMediaWindow.cpp b/xbmc/windows/GUIMediaWindow.cpp
@@ -544,7 +544,7 @@ void CGUIMediaWindow::UpdateButtons()
     m_viewControl.SetCurrentView(m_guiState->GetViewAsControl());
 
     // Update sort by button
-    if (m_guiState->GetSortMethod().sortBy == SortByNone)
+    if (!m_guiState->HasMultipleSortMethods())
       CONTROL_DISABLE(CONTROL_BTNSORTBY);
     else
       CONTROL_ENABLE(CONTROL_BTNSORTBY);