From 6950cfef357942e057c948714c6b7c1e2f0f2a80 Mon Sep 17 00:00:00 2001
From: Peter Thoman <peter.thoman@uibk.ac.at>
Date: Tue, 30 Apr 2013 12:14:34 +0200
Subject: [PATCH] Changed xBRZ UI to have separate off option

---
 Core/Config.cpp           |   2 +-
 Core/Config.h             |   2 +-
 Windows/WndMainWindow.cpp |  22 +++++++++++++---------
 Windows/ppsspp.rc         | Bin 36992 -> 37142 bytes
 Windows/resource.h        | Bin 163888 -> 163982 bytes
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/Core/Config.cpp b/Core/Config.cpp
index fb4f91981d..b38dcfd3c9 100644
--- a/Core/Config.cpp
+++ b/Core/Config.cpp
@@ -113,7 +113,7 @@ void Config::Load(const char *iniFileName)
 #else
 	graphics->Get("MipMap", &bMipMap, false);
 #endif
-	graphics->Get("XBRZTexScalingLevel", &iXBRZTexScalingLevel, 0);
+	graphics->Get("XBRZTexScalingLevel", &iXBRZTexScalingLevel, 1);
 
 	IniFile::Section *sound = iniFile.GetOrCreateSection("Sound");
 	sound->Get("Enable", &bEnableSound, true);
diff --git a/Core/Config.h b/Core/Config.h
index f004956e20..8b6aec96ca 100644
--- a/Core/Config.h
+++ b/Core/Config.h
@@ -71,7 +71,7 @@ public:
 	bool bTrueColor;
 	bool bMipMap;
 	bool bAnisotropicFiltering;
-	int iXBRZTexScalingLevel; // 0 = 1 = off, 2 = 2xBRZ, 3 = 3xBRZ, ..., 5 = 5xBRZ
+	int iXBRZTexScalingLevel; // 1 = off, 2 = 2xBRZ, ..., 5 = 5xBRZ
 
 	// Sound
 	bool bEnableSound;
diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp
index 6d13f9c89e..788c1da8fe 100644
--- a/Windows/WndMainWindow.cpp
+++ b/Windows/WndMainWindow.cpp
@@ -175,8 +175,8 @@ namespace MainWindow
 		ResizeDisplay();
 	}
 
-	void toggleXbrzTexScaling(int num) {
-		g_Config.iXBRZTexScalingLevel = (g_Config.iXBRZTexScalingLevel == num) ? 0 : num;
+	void setXbrzTexScaling(int num) {
+		g_Config.iXBRZTexScalingLevel = num;
 		if(gpu) gpu->InvalidateCache(0,0);
 	}
 
@@ -500,17 +500,20 @@ namespace MainWindow
 				g_Config.bMipMap = !g_Config.bMipMap;
 				break;
 
+			case ID_TEXTURESCALING_OFF:
+				setXbrzTexScaling(1);
+				break;
 			case ID_TEXTURESCALING_2XBRZ:
-				toggleXbrzTexScaling(2);
+				setXbrzTexScaling(2);
 				break;
 			case ID_TEXTURESCALING_3XBRZ:
-				toggleXbrzTexScaling(3);
+				setXbrzTexScaling(3);
 				break;
 			case ID_TEXTURESCALING_4XBRZ:
-				toggleXbrzTexScaling(4);
+				setXbrzTexScaling(4);
 				break;
 			case ID_TEXTURESCALING_5XBRZ:
-				toggleXbrzTexScaling(5);
+				setXbrzTexScaling(5);
 				break;
 
 			case ID_OPTIONS_BUFFEREDRENDERING:
@@ -804,14 +807,15 @@ namespace MainWindow
 			CheckMenuItem(menu, zoomitems[i], MF_BYCOMMAND | ((i == g_Config.iWindowZoom - 1) ? MF_CHECKED : MF_UNCHECKED));
 		}
 
-		static const int texscalingitems[4] = {
+		static const int texscalingitems[] = {
+			ID_TEXTURESCALING_OFF,
 			ID_TEXTURESCALING_2XBRZ,
 			ID_TEXTURESCALING_3XBRZ,
 			ID_TEXTURESCALING_4XBRZ,
 			ID_TEXTURESCALING_5XBRZ,
 		};
-		for (int i = 0; i < 4; i++) {
-			CheckMenuItem(menu, texscalingitems[i], MF_BYCOMMAND | ((i == g_Config.iXBRZTexScalingLevel-2) ? MF_CHECKED : MF_UNCHECKED));
+		for (int i = 0; i < 5; i++) {
+			CheckMenuItem(menu, texscalingitems[i], MF_BYCOMMAND | ((i == g_Config.iXBRZTexScalingLevel-1) ? MF_CHECKED : MF_UNCHECKED));
 		}
 	}
 
diff --git a/Windows/ppsspp.rc b/Windows/ppsspp.rc
index c003dd1ba716c23e7836aa7e3bff1cdfad7f05a3..172aeaeab6a310b0d6b70dec1ed792d2c7e291eb 100644
GIT binary patch
delta 46
zcmZoz$TV#c(}sdlR)2;xhP26zX{wV2*o7uPC{qE7xG}g*o+u_eIUq%3b3v(qGyrWe
B4$uGq

delta 14
VcmbQXh^b*A(}sf5&1_`?(f};-1x)||

diff --git a/Windows/resource.h b/Windows/resource.h
index 927c4ee9838352c56790693778fb6b78a8f8ec42..444cd777181de5cbd014f5f71a982df72014ce63 100644
GIT binary patch
delta 63
zcmV-F0KosSfC`R*3V?(Gv;q=um)>jwAOlYTMw5|-8Mp9m0^ALkBz*#4m&|+uShs|I
V0?+}MR&N3pmkfUb7?*;70<Q337eoL6

delta 54
zcmV-60LlN3feNsI3V?(Gv;q=uw{UL)x($=u5D1r&eF9LIDt!WAx8i*Q&;ghDZUPpU
M5Pt#`m)w5>vN{nI?f?J)