Skip to content

Commit

Permalink
Merge pull request #12821 from JuliusSenkus/unified-resolution-scaling
Browse files Browse the repository at this point in the history
#8714 Unified resolution scaling for all platforms.
  • Loading branch information
hrydgard authored Apr 13, 2020
2 parents cc57a6f + 68406b9 commit 3bf97ce
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions UI/GameSettingsScreen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -314,11 +314,7 @@ void GameSettingsScreen::CreateViews() {
#endif

graphicsSettings->Add(new ItemHeader(gr->T("Performance")));
#ifndef MOBILE_DEVICE
static const char *internalResolutions[] = { "Auto (1:1)", "1x PSP", "2x PSP", "3x PSP", "4x PSP", "5x PSP", "6x PSP", "7x PSP", "8x PSP", "9x PSP", "10x PSP" };
#else
static const char *internalResolutions[] = { "Auto (1:1)", "1x PSP", "2x PSP", "3x PSP", "4x PSP", "5x PSP" };
#endif
resolutionChoice_ = graphicsSettings->Add(new PopupMultiChoice(&g_Config.iInternalResolution, gr->T("Rendering Resolution"), internalResolutions, 0, ARRAY_SIZE(internalResolutions), gr->GetName(), screenManager()));
resolutionChoice_->OnChoice.Handle(this, &GameSettingsScreen::OnResolutionChange);
resolutionChoice_->SetEnabledFunc([] {
Expand Down

0 comments on commit 3bf97ce

Please sign in to comment.