From 4dba847ea40243f7d54b32d84a1c0838a2f2fc55 Mon Sep 17 00:00:00 2001
From: Siddharth <siddu.druid@gmail.com>
Date: Tue, 8 Oct 2013 19:08:50 +0530
Subject: [PATCH] Uses StickyChoice's Highlight() to highlight save slots in
 use

---
 UI/MainScreen.cpp | 25 ++++++++++++++-----------
 UI/NativeApp.cpp  |  4 ++--
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp
index a8abcbdf01..4a7f8c4ba4 100644
--- a/UI/MainScreen.cpp
+++ b/UI/MainScreen.cpp
@@ -48,6 +48,8 @@
 #include <QDir>
 #endif
 
+#include <sstream>
+
 #ifdef _WIN32
 namespace MainWindow {
 	void BrowseAndBoot(std::string defaultPath, bool browseDirectory = false);
@@ -707,6 +709,8 @@ GamePauseScreen::~GamePauseScreen() {
 }
 
 void GamePauseScreen::CreateViews() {
+	static const int NUM_SAVESLOTS = 5; 
+
 	using namespace UI;
 	Margins actionMenuMargins(0, 100, 15, 0);
 	I18NCategory *gs = GetI18NCategory("Graphics");
@@ -721,24 +725,23 @@ void GamePauseScreen::CreateViews() {
 
 	ViewGroup *leftColumnItems = new LinearLayout(ORIENT_VERTICAL);
 	leftColumn->Add(leftColumnItems);
-
 	saveSlots_ = leftColumnItems->Add(new ChoiceStrip(ORIENT_HORIZONTAL, new LinearLayoutParams(300, WRAP_CONTENT)));
 	
-	saveSlots_->AddChoice(" 1 ");
-	saveSlots_->AddChoice(" 2 ");
-	saveSlots_->AddChoice(" 3 ");
-	saveSlots_->AddChoice(" 4 ");
-	saveSlots_->AddChoice(" 5 ");
 	
-	saveSlots_->SetSelection(g_Config.iCurrentStateSlot);
-	saveSlots_->OnChoice.Handle(this, &GamePauseScreen::OnStateSelected);
-	
-	for(int i = 0; i < 5; i++){
-		if(SaveState::HasSaveInSlot(i)){
+	for (int i = 0; i < NUM_SAVESLOTS; i++){
+		std::stringstream saveSlotText;
+		saveSlotText<<" "<<i + 1<<" ";
+		
+		saveSlots_->AddChoice(saveSlotText.str());
+
+		if (SaveState::HasSaveInSlot(i)) {
 			saveSlots_->HighlightChoice(i);
 		}
 	}
+	saveSlots_->SetSelection(g_Config.iCurrentStateSlot);
 
+	saveSlots_->OnChoice.Handle(this, &GamePauseScreen::OnStateSelected);
+	
 	saveStateButton_ = leftColumnItems->Add(new Choice(i->T("Save State")));
 	saveStateButton_->OnClick.Handle(this, &GamePauseScreen::OnSaveState);
 
diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
index a0ad52637b..f98cbce6fc 100644
--- a/UI/NativeApp.cpp
+++ b/UI/NativeApp.cpp
@@ -451,8 +451,8 @@ void NativeInitGraphics() {
 	ui_theme.itemDownStyle.fgColor = 0xFFFFFFFF;
 	ui_theme.itemDisabledStyle.background = UI::Drawable(0x55E0D4AF);
 	ui_theme.itemDisabledStyle.fgColor = 0xFFcccccc;
-	ui_theme.itemHighlightedStyle.background = UI::Drawable(0x22edc24c);
-	ui_theme.itemHighlightedStyle.fgColor = 0xFFbd9939;
+	ui_theme.itemHighlightedStyle.background = UI::Drawable(0xFFbdBB39);
+	ui_theme.itemHighlightedStyle.fgColor = 0xFFFFFFFF;
 
 	ui_theme.buttonStyle = ui_theme.itemStyle;
 	ui_theme.buttonFocusedStyle = ui_theme.itemFocusedStyle;