Rename the setting to Display Rotation, put the string in the graphics category

This commit is contained in:
Henrik Rydgard 2015-05-16 20:09:01 +02:00
parent ae9ece28d2
commit b7ffb3a102
2 changed files with 6 additions and 7 deletions

View File

@ -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;

View File

@ -109,7 +109,7 @@ private:
bool postProcEnable_;
bool resolutionEnable_;
bool bloomHackEnable_;
bool screenRotEnable_;
bool displayRotEnable_;
};
class DeveloperToolsScreen : public UIDialogScreenWithBackground {