by date turns white like my own does when selected

1 files changed, 39 insertions, 36 deletions

diff --git a/src/search/SearchView.cpp b/src/search/SearchView.cpp
index 3e73496..474c4e3 100644
--- a/src/search/SearchView.cpp
+++ b/src/search/SearchView.cpp
@@ -53,6 +53,7 @@ SearchView::SearchView():
 	};
 	sortButton = new ui::Button(ui::Point(XRES+BARSIZE-140, 10), ui::Point(61, 17), "Sort");
 	sortButton->SetIcon(IconVoteSort);
+	sortButton->SetTogglable(true);
 	sortButton->SetActionCallback(new SortAction(this));
 	sortButton->Appearance.HorizontalAlign = ui::Appearance::AlignCentre;
 	sortButton->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
@@ -274,54 +275,56 @@ void SearchView::NotifySortChanged(SearchModel * sender)
 {
 	if(sender->GetSort() == "best")
 	{
- 	   sortButton->SetText("By votes");
-	   sortButton->SetIcon(IconVoteSort);
+		sortButton->SetToggleState(false);
+		sortButton->SetText("By votes");
+		sortButton->SetIcon(IconVoteSort);
 	}
- 	else
+	else
 	{
- 		sortButton->SetText("By date");
+		sortButton->SetToggleState(true);
+		sortButton->SetText("By date");
 		sortButton->SetIcon(IconDateSort);
 	}
 }
 
 void SearchView::NotifyShowOwnChanged(SearchModel * sender)
 {
-    ownButton->SetToggleState(sender->GetShowOwn());
-    if(sender->GetShowOwn() || Client::Ref().GetAuthUser().UserElevation == User::ElevationAdmin || Client::Ref().GetAuthUser().UserElevation == User::ElevationModerator)
-    {
-    	unpublishSelected->Enabled = true;
-    	removeSelected->Enabled = true;
-    }
-    else if(sender->GetShowFavourite())
-    {
-    	unpublishSelected->Enabled = false;
-    	removeSelected->Enabled = false;
-    }
-    else
-    {
-    	unpublishSelected->Enabled = false;
-    	removeSelected->Enabled = false;
-    }
+	ownButton->SetToggleState(sender->GetShowOwn());
+	if(sender->GetShowOwn() || Client::Ref().GetAuthUser().UserElevation == User::ElevationAdmin || Client::Ref().GetAuthUser().UserElevation == User::ElevationModerator)
+	{
+		unpublishSelected->Enabled = true;
+		removeSelected->Enabled = true;
+	}
+	else if(sender->GetShowFavourite())
+	{
+		unpublishSelected->Enabled = false;
+		removeSelected->Enabled = false;
+	}
+	else
+	{
+		unpublishSelected->Enabled = false;
+		removeSelected->Enabled = false;
+	}
 }
 
 void SearchView::NotifyShowFavouriteChanged(SearchModel * sender)
 {
-    favButton->SetToggleState(sender->GetShowFavourite());
-    if(sender->GetShowFavourite())
-    {
-    	unpublishSelected->Enabled = false;
-    	removeSelected->Enabled = false;
-    }
-    else if(sender->GetShowOwn() || Client::Ref().GetAuthUser().UserElevation == User::ElevationAdmin || Client::Ref().GetAuthUser().UserElevation == User::ElevationModerator)
-    {
-    	unpublishSelected->Enabled = true;
-    	removeSelected->Enabled = true;
-    }
-    else
-    {
-    	unpublishSelected->Enabled = false;
-    	removeSelected->Enabled = false;
-    }
+	favButton->SetToggleState(sender->GetShowFavourite());
+	if(sender->GetShowFavourite())
+	{
+		unpublishSelected->Enabled = false;
+		removeSelected->Enabled = false;
+	}
+	else if(sender->GetShowOwn() || Client::Ref().GetAuthUser().UserElevation == User::ElevationAdmin || Client::Ref().GetAuthUser().UserElevation == User::ElevationModerator)
+	{
+		unpublishSelected->Enabled = true;
+		removeSelected->Enabled = true;
+	}
+	else
+	{
+		unpublishSelected->Enabled = false;
+		removeSelected->Enabled = false;
+	}
 }
 
 void SearchView::NotifyPageChanged(SearchModel * sender)