thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GUI: Don't create a popup for the stretch mode if it's not supported

Browse source
This commit is contained in:
Cameron Cawley 2023-02-05 18:54:04 +00:00 • committed by Eugene Sandulenko
parent 380643315e
commit 5f06b599c8
1 changed files with 60 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

113
gui/options.cpp
View file

@ -346,26 +346,6 @@ void OptionsDialog::build() {
_renderModePopUp->setSelectedTag(sel); _renderModePopUp->setSelectedTag(sel);
} }
_stretchPopUp->setSelected(0);
if (g_system->hasFeature(OSystem::kFeatureStretchMode)) {
if (ConfMan.hasKey("stretch_mode", _domain)) {
const OSystem::GraphicsMode *sm = g_system->getSupportedStretchModes();
Common::String stretchMode(ConfMan.get("stretch_mode", _domain));
int stretchCount = 1;
while (sm->name) {
stretchCount++;
if (scumm_stricmp(sm->name, stretchMode.c_str()) == 0)
_stretchPopUp->setSelected(stretchCount);
sm++;
}
}
} else {
_stretchPopUpDesc->setVisible(false);
_stretchPopUp->setVisible(false);
_stretchPopUp->setEnabled(false);
}
_scalerPopUp->setSelected(0); _scalerPopUp->setSelected(0);
_scaleFactorPopUp->setSelected(0); _scaleFactorPopUp->setSelected(0);
@ -442,6 +422,27 @@ void OptionsDialog::build() {
} }
} }
if (_stretchPopUp) {
if (g_system->hasFeature(OSystem::kFeatureStretchMode)) {
_stretchPopUp->setSelected(0);
if (ConfMan.hasKey("stretch_mode", _domain)) {
const OSystem::GraphicsMode *sm = g_system->getSupportedStretchModes();
Common::String stretchMode(ConfMan.get("stretch_mode", _domain));
int stretchCount = 1;
while (sm->name) {
stretchCount++;
if (scumm_stricmp(sm->name, stretchMode.c_str()) == 0)
_stretchPopUp->setSelected(stretchCount);
sm++;
}
}
} else {
_stretchPopUpDesc->setVisible(false);
_stretchPopUp->setVisible(false);
}
}
// Shader options // Shader options
if (_shader) { if (_shader) {
if (g_system->hasFeature(OSystem::kFeatureShaders)) { if (g_system->hasFeature(OSystem::kFeatureShaders)) {
@ -650,28 +651,30 @@ void OptionsDialog::apply() {
} }
} }
isSet = false; if (g_system->hasFeature(OSystem::kFeatureStretchMode)) {
if ((int32)_stretchPopUp->getSelectedTag() >= 0) { isSet = false;
const OSystem::GraphicsMode *sm = g_system->getSupportedStretchModes(); if ((int32)_stretchPopUp->getSelectedTag() >= 0) {
const OSystem::GraphicsMode *sm = g_system->getSupportedStretchModes();
while (sm->name) { while (sm->name) {
if (sm->id == (int)_stretchPopUp->getSelectedTag()) { if (sm->id == (int)_stretchPopUp->getSelectedTag()) {
if (ConfMan.get("stretch_mode", _domain) != sm->name) { if (ConfMan.get("stretch_mode", _domain) != sm->name) {
graphicsModeChanged = true; graphicsModeChanged = true;
ConfMan.set("stretch_mode", sm->name, _domain); ConfMan.set("stretch_mode", sm->name, _domain);
_stretchPopUpDesc->setFontColor(ThemeEngine::FontColor::kFontColorNormal); _stretchPopUpDesc->setFontColor(ThemeEngine::FontColor::kFontColorNormal);
}
isSet = true;
break;
} }
isSet = true; sm++;
break;
} }
sm++;
} }
} if (!isSet) {
if (!isSet) { _stretchPopUpDesc->setFontColor(ThemeEngine::FontColor::kFontColorNormal);
_stretchPopUpDesc->setFontColor(ThemeEngine::FontColor::kFontColorNormal); ConfMan.removeKey("stretch_mode", _domain);
ConfMan.removeKey("stretch_mode", _domain); if (g_system->getStretchMode() != g_system->getDefaultStretchMode())
if (g_system->getStretchMode() != g_system->getDefaultStretchMode()) graphicsModeChanged = true;
graphicsModeChanged = true; }
} }
isSet = false; isSet = false;
@ -1229,8 +1232,11 @@ void OptionsDialog::setGraphicSettingsState(bool enabled) {
_stretchPopUpDesc->setEnabled(enabled); _stretchPopUpDesc->setEnabled(enabled);
_stretchPopUp->setEnabled(enabled); _stretchPopUp->setEnabled(enabled);
} else { } else {
_stretchPopUpDesc->setEnabled(false); // Happens when we switch to backend that doesn't support stretch modes
_stretchPopUp->setEnabled(false); if (_stretchPopUp) {
_stretchPopUpDesc->setEnabled(false);
_stretchPopUp->setEnabled(false);
}
} }
if (g_system->hasFeature(OSystem::kFeatureScalers)) { if (g_system->hasFeature(OSystem::kFeatureScalers)) {
@ -1582,17 +1588,19 @@ void OptionsDialog::addGraphicControls(GuiObject *boss, const Common::String &pr
} }
// The Stretch mode popup // The Stretch mode popup
const OSystem::GraphicsMode *sm = g_system->getSupportedStretchModes(); if (g_system->hasFeature(OSystem::kFeatureStretchMode)) {
_stretchPopUpDesc = new StaticTextWidget(boss, prefix + "grStretchModePopupDesc", _("Stretch mode:")); const OSystem::GraphicsMode *sm = g_system->getSupportedStretchModes();
if (ConfMan.isKeyTemporary("stretch_mode")) _stretchPopUpDesc = new StaticTextWidget(boss, prefix + "grStretchModePopupDesc", _("Stretch mode:"));
_stretchPopUpDesc->setFontColor(ThemeEngine::FontColor::kFontColorOverride); if (ConfMan.isKeyTemporary("stretch_mode"))
_stretchPopUp = new PopUpWidget(boss, prefix + "grStretchModePopup"); _stretchPopUpDesc->setFontColor(ThemeEngine::FontColor::kFontColorOverride);
_stretchPopUp = new PopUpWidget(boss, prefix + "grStretchModePopup");
_stretchPopUp->appendEntry(_("<default>")); _stretchPopUp->appendEntry(_("<default>"));
_stretchPopUp->appendEntry(Common::U32String()); _stretchPopUp->appendEntry(Common::U32String());
while (sm->name) { while (sm->name) {
_stretchPopUp->appendEntry(_c(sm->description, context), sm->id); _stretchPopUp->appendEntry(_c(sm->description, context), sm->id);
sm++; sm++;
}
} }
// The Scaler popup // The Scaler popup
@ -1998,6 +2006,8 @@ void OptionsDialog::setupGraphicsTab() {
// Fixes crash when switching from SDL Surface to OpenGL // Fixes crash when switching from SDL Surface to OpenGL
if (!_shader && g_system->hasFeature(OSystem::kFeatureShaders)) { if (!_shader && g_system->hasFeature(OSystem::kFeatureShaders)) {
rebuild(); rebuild();
} else if (!_stretchPopUp && g_system->hasFeature(OSystem::kFeatureStretchMode)) {
rebuild();
} }
setGraphicSettingsState(_enableGraphicSettings); setGraphicSettingsState(_enableGraphicSettings);
} }
@ -2008,9 +2018,6 @@ void OptionsDialog::setupGraphicsTab() {
if (g_system->hasFeature(OSystem::kFeatureStretchMode)) { if (g_system->hasFeature(OSystem::kFeatureStretchMode)) {
_stretchPopUpDesc->setVisible(true); _stretchPopUpDesc->setVisible(true);
_stretchPopUp->setVisible(true); _stretchPopUp->setVisible(true);
} else {
_stretchPopUpDesc->setVisible(false);
_stretchPopUp->setVisible(false);
} }
_fullscreenCheckbox->setVisible(true); _fullscreenCheckbox->setVisible(true);
if (g_system->hasFeature(OSystem::kFeatureFilteringMode)) if (g_system->hasFeature(OSystem::kFeatureFilteringMode))