From b7ffb3a1027702a1170a757601ea128f8e46a4d2 Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Sat, 16 May 2015 20:09:01 +0200 Subject: [PATCH] Rename the setting to Display Rotation, put the string in the graphics category --- UI/GameSettingsScreen.cpp | 11 +++++------ UI/GameSettingsScreen.h | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index efe8de98f4..1b2d997d9f 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -182,11 +182,10 @@ void GameSettingsScreen::CreateViews() { resolutionEnable_ = !g_Config.bSoftwareRendering && (g_Config.iRenderingMode != FB_NON_BUFFERED_MODE); resolutionChoice_->SetEnabledPtr(&resolutionEnable_); - // Not sure if we should call this one something different? For now we call it the same as the Android screen rotation option and just put it on the graphics tab. - static const char *screenRotation[] = {"Landscape", "Portrait", "Landscape Reversed", "Portrait Reversed"}; - PopupMultiChoice *scrRotChoice = graphicsSettings->Add(new PopupMultiChoice(&g_Config.iInternalScreenRotation, c->T("Screen Rotation"), screenRotation, 1, ARRAY_SIZE(screenRotation), c, screenManager())); - scrRotChoice->SetEnabledPtr(&screenRotEnable_); - screenRotEnable_ = (g_Config.iRenderingMode != FB_NON_BUFFERED_MODE); + static const char *displayRotation[] = {"Landscape", "Portrait", "Landscape Reversed", "Portrait Reversed"}; + PopupMultiChoice *dispRotChoice = graphicsSettings->Add(new PopupMultiChoice(&g_Config.iInternalScreenRotation, gs->T("Display Rotation"), displayRotation, 1, ARRAY_SIZE(displayRotation), c, screenManager())); + dispRotChoice->SetEnabledPtr(&displayRotEnable_); + displayRotEnable_ = (g_Config.iRenderingMode != FB_NON_BUFFERED_MODE); #ifdef ANDROID static const char *deviceResolutions[] = { "Native device resolution", "Auto (same as Rendering)", "1x PSP", "2x PSP", "3x PSP", "4x PSP", "5x PSP" }; @@ -656,7 +655,7 @@ UI::EventReturn GameSettingsScreen::OnRenderingMode(UI::EventParams &e) { postProcEnable_ = !g_Config.bSoftwareRendering && (g_Config.iRenderingMode != FB_NON_BUFFERED_MODE); resolutionEnable_ = !g_Config.bSoftwareRendering && (g_Config.iRenderingMode != FB_NON_BUFFERED_MODE); - screenRotEnable_ = (g_Config.iRenderingMode != FB_NON_BUFFERED_MODE); + displayRotEnable_ = (g_Config.iRenderingMode != FB_NON_BUFFERED_MODE); if (g_Config.iRenderingMode == FB_NON_BUFFERED_MODE) { g_Config.bAutoFrameSkip = false; diff --git a/UI/GameSettingsScreen.h b/UI/GameSettingsScreen.h index a50651a6ec..6b80c81c4d 100644 --- a/UI/GameSettingsScreen.h +++ b/UI/GameSettingsScreen.h @@ -109,7 +109,7 @@ private: bool postProcEnable_; bool resolutionEnable_; bool bloomHackEnable_; - bool screenRotEnable_; + bool displayRotEnable_; }; class DeveloperToolsScreen : public UIDialogScreenWithBackground {