Merge pull request #12637 from iota97/region

Region flag and game ID on game selection screen
hrydgard · Feb 26, 2020 · 3af63b6 · 3af63b6
2 parents 4602f89 + 407d5df
commit 3af63b6
Show file tree

Hide file tree

Showing 20 changed files with 34,164 additions and 33,932 deletions.
diff --git a/Core/Config.cpp b/Core/Config.cpp
@@ -448,6 +448,8 @@ static ConfigSetting generalSettings[] = {
 	ConfigSetting("EnableStateUndo", &g_Config.bEnableStateUndo, &DefaultEnableStateUndo, true, true),
 	ConfigSetting("RewindFlipFrequency", &g_Config.iRewindFlipFrequency, 0, true, true),
 
+	ConfigSetting("ShowRegionOnGameIcon", &g_Config.bShowRegionOnGameIcon, false, true, true),
+	ConfigSetting("ShowIDOnGameIcon", &g_Config.bShowIDOnGameIcon, false, true, true),
 	ConfigSetting("GridView1", &g_Config.bGridView1, true),
 	ConfigSetting("GridView2", &g_Config.bGridView2, true),
 	ConfigSetting("GridView3", &g_Config.bGridView3, false),

diff --git a/Core/Config.h b/Core/Config.h
@@ -209,6 +209,8 @@ struct Config {
 	// UI
 	bool bShowDebuggerOnLoad;
 	int iShowFPSCounter;
+	bool bShowRegionOnGameIcon;
+	bool bShowIDOnGameIcon;
 
 	// TODO: Maybe move to a separate theme system.
 	uint32_t uItemStyleFg;

diff --git a/UI/GameInfoCache.cpp b/UI/GameInfoCache.cpp
@@ -265,6 +265,7 @@ void GameInfo::ParseParamSFO() {
 		case 'J': region = GAMEREGION_JAPAN; break;
 		case 'H': region = GAMEREGION_HONGKONG; break;
 		case 'A': region = GAMEREGION_ASIA; break;
+		case 'K': region = GAMEREGION_KOREA; break;
 		}
 		/*
 		if (regStr == "NPEZ" || regStr == "NPEG" || regStr == "ULES" || regStr == "UCES" ||

diff --git a/UI/GameInfoCache.h b/UI/GameInfoCache.h
@@ -46,6 +46,7 @@ enum GameRegion {
 	GAMEREGION_EUROPE,
 	GAMEREGION_HONGKONG,
 	GAMEREGION_ASIA,
+	GAMEREGION_KOREA,
 	GAMEREGION_OTHER,
 	GAMEREGION_MAX,
 };

diff --git a/UI/GameScreen.cpp b/UI/GameScreen.cpp
@@ -217,7 +217,8 @@ void GameScreen::render() {
 			"USA",
 			"Europe",
 			"Hong Kong",
-			"Asia"
+			"Asia",
+			"Korea"
 		};
 		tvRegion_->SetText(ga->T(regionNames[info->region]));
 	} else if (info->region > GAMEREGION_MAX){

diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
@@ -718,6 +718,8 @@ void GameSettingsScreen::CreateViews() {
 #endif
 
 	systemSettings->Add(new CheckBox(&g_Config.bCheckForNewVersion, sy->T("VersionCheck", "Check for new versions of PPSSPP")));
+	systemSettings->Add(new CheckBox(&g_Config.bShowIDOnGameIcon, sy->T("Show ID on game selection screen")));
+	systemSettings->Add(new CheckBox(&g_Config.bShowRegionOnGameIcon, sy->T("Show region flag on game selection screen")));
 	if (g_Config.iMaxRecent > 0)
 		systemSettings->Add(new Choice(sy->T("Clear Recent Games List")))->OnClick.Handle(this, &GameSettingsScreen::OnClearRecents);
 

diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp
@@ -280,6 +280,9 @@ void GameButton::Draw(UIContext &dc) {
 	// Render button
 	int dropsize = 10;
 	if (texture) {
+		if (!gridStyle_) {
+			x += 4;
+		}
 		if (txOffset) {
 			dropsize = 3;
 			y += txOffset * 2;
@@ -335,14 +338,22 @@ void GameButton::Draw(UIContext &dc) {
 		dc.MeasureText(dc.GetFontStyle(), 1.0f, 1.0f, title_.c_str(), &tw, &th, 0);
 
 		int availableWidth = bounds_.w - 150;
+		if (g_Config.bShowIDOnGameIcon) {
+			float vw, vh;
+			dc.MeasureText(dc.GetFontStyle(), 0.7f, 0.7f, ginfo->id_version.c_str(), &vw, &vh, 0);
+			availableWidth -= vw + 20;
+			dc.SetFontScale(0.7f, 0.7f);
+			dc.DrawText(ginfo->id_version.c_str(), availableWidth + 160, bounds_.centerY(), style.fgColor, ALIGN_VCENTER);
+			dc.SetFontScale(1.0f, 1.0f);
+		}
 		float sineWidth = std::max(0.0f, (tw - availableWidth)) / 2.0f;
 
 		float tx = 150;
 		if (availableWidth < tw) {
 			tx -= (1.0f + sin(time_now_d() * 1.5f)) * sineWidth;
 			Bounds tb = bounds_;
 			tb.x = bounds_.x + 150;
-			tb.w = bounds_.w - 150;
+			tb.w = availableWidth;
 			dc.PushScissor(tb);
 		}
 		dc.DrawText(title_.c_str(), bounds_.x + tx, bounds_.centerY(), style.fgColor, ALIGN_VCENTER);
@@ -361,7 +372,32 @@ void GameButton::Draw(UIContext &dc) {
 		dc.Draw()->Flush();
 	}
 	if (ginfo->hasConfig && !ginfo->id.empty()) {
-		dc.Draw()->DrawImage(I_GEAR, x, y + h - ui_images[I_GEAR].h, 1.0f);
+		if (gridStyle_) {
+			dc.Draw()->DrawImage(I_GEAR, x, y + h - ui_images[I_GEAR].h, 1.0f);
+		} else {
+			dc.Draw()->DrawImage(I_GEAR, x - ui_images[I_GEAR].w, y, 1.0f);
+		}
+	}
+	if (g_Config.bShowRegionOnGameIcon && ginfo->region >= 0 && ginfo->region < GAMEREGION_MAX && ginfo->region != GAMEREGION_OTHER) {
+		static const int regionIcons[GAMEREGION_MAX] = {
+			I_FLAG_JP,
+			I_FLAG_US,
+			I_FLAG_EU,
+			I_FLAG_HK,
+			I_FLAG_AS,
+			I_FLAG_KO
+		};
+		if (gridStyle_) {
+			dc.Draw()->DrawImage(regionIcons[ginfo->region], x + w - ui_images[regionIcons[ginfo->region]].w - 5, y + h - ui_images[regionIcons[ginfo->region]].h - 5, 1.0f);
+		} else {
+			dc.Draw()->DrawImage(regionIcons[ginfo->region], x - 2 - ui_images[regionIcons[ginfo->region]].w - 3, y + h - ui_images[regionIcons[ginfo->region]].h - 5, 1.0f);
+		}
+	}
+	if (gridStyle_ && g_Config.bShowIDOnGameIcon) {
+		dc.SetFontScale(0.5f, 0.5f);
+		dc.DrawText(ginfo->id_version.c_str(), x+5, y+1, 0xFF000000, ALIGN_TOPLEFT);
+		dc.DrawText(ginfo->id_version.c_str(), x+4, y, 0xFFffFFff, ALIGN_TOPLEFT);
+		dc.SetFontScale(1.0f, 1.0f);
 	}
 	if (overlayColor) {
 		dc.FillRect(Drawable(overlayColor), overlayBounds);