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

ALL: add support for gfx, stretch and render mode

Browse source
This commit is contained in:
grisenti 2022-05-07 00:15:57 +02:00 • committed by Eugene Sandulenko
parent a7ed28e8a7
commit b7f6964fb4
2 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
base/commandLine.cpp
View file

@ -1842,6 +1842,15 @@ bool processSettings(Common::String &command, Common::StringMap &settings, Commo
if (settings.contains("gui-theme")) { if (settings.contains("gui-theme")) {
ConfMan.set("gui_theme", settings["gui-theme"], Common::ConfigManager::kSessionDomain); ConfMan.set("gui_theme", settings["gui-theme"], Common::ConfigManager::kSessionDomain);
} }
if (settings.contains("gfx-mode")) {
ConfMan.set("gfx_mode", settings["gfx-mode"], Common::ConfigManager::kSessionDomain);
}
if (settings.contains("stretch-mode")) {
ConfMan.set("stretch_mode", settings["stretch-mode"], Common::ConfigManager::kSessionDomain);
}
if (settings.contains("render-mode")) {
ConfMan.set("render_mode", settings["render-mode"], Common::ConfigManager::kSessionDomain);
}
// Finally, store the command line settings into the config manager. // Finally, store the command line settings into the config manager.

13
gui/options.cpp
View file

@ -572,6 +572,7 @@ void OptionsDialog::apply() {
bool isSet = false; bool isSet = false;
if ((int32)_gfxPopUp->getSelectedTag() >= 0) { if ((int32)_gfxPopUp->getSelectedTag() >= 0) {
_gfxPopUpDesc->setFontColor(ThemeEngine::FontColor::kFontColorNormal);
const OSystem::GraphicsMode *gm = g_system->getSupportedGraphicsModes(); const OSystem::GraphicsMode *gm = g_system->getSupportedGraphicsModes();
while (gm->name) { while (gm->name) {
@ -591,12 +592,16 @@ void OptionsDialog::apply() {
graphicsModeChanged = true; graphicsModeChanged = true;
} }
if ((int32)_renderModePopUp->getSelectedTag() >= 0) if ((int32)_renderModePopUp->getSelectedTag() >= 0) {
_renderModePopUpDesc->setFontColor(ThemeEngine::FontColor::kFontColorNormal);
ConfMan.set("render_mode", Common::getRenderModeCode((Common::RenderMode)_renderModePopUp->getSelectedTag()), _domain); ConfMan.set("render_mode", Common::getRenderModeCode((Common::RenderMode)_renderModePopUp->getSelectedTag()), _domain);
}
isSet = false; isSet = false;
if ((int32)_stretchPopUp->getSelectedTag() >= 0) { if ((int32)_stretchPopUp->getSelectedTag() >= 0) {
_stretchPopUpDesc->setFontColor(ThemeEngine::FontColor::kFontColorNormal);
const OSystem::GraphicsMode *sm = g_system->getSupportedStretchModes(); 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)
@ -1383,6 +1388,8 @@ void OptionsDialog::addGraphicControls(GuiObject *boss, const Common::String &pr
// The GFX mode popup // The GFX mode popup
_gfxPopUpDesc = new StaticTextWidget(boss, prefix + "grModePopupDesc", _("Graphics mode:")); _gfxPopUpDesc = new StaticTextWidget(boss, prefix + "grModePopupDesc", _("Graphics mode:"));
if (ConfMan.isKeyTemporary("gfx_mode"))
_gfxPopUpDesc->setFontColor(ThemeEngine::FontColor::kFontColorOverride);
_gfxPopUp = new PopUpWidget(boss, prefix + "grModePopup"); _gfxPopUp = new PopUpWidget(boss, prefix + "grModePopup");
_gfxPopUp->appendEntry(_("<default>")); _gfxPopUp->appendEntry(_("<default>"));
@ -1397,6 +1404,8 @@ void OptionsDialog::addGraphicControls(GuiObject *boss, const Common::String &pr
bool renderingTypeDefined = (strpbrk(_guioptions.c_str(), allFlags.c_str()) != nullptr); bool renderingTypeDefined = (strpbrk(_guioptions.c_str(), allFlags.c_str()) != nullptr);
_renderModePopUpDesc = new StaticTextWidget(boss, prefix + "grRenderPopupDesc", _("Render mode:"), _("Special dithering modes supported by some games")); _renderModePopUpDesc = new StaticTextWidget(boss, prefix + "grRenderPopupDesc", _("Render mode:"), _("Special dithering modes supported by some games"));
if (ConfMan.isKeyTemporary("render_mode"))
_renderModePopUpDesc->setFontColor(ThemeEngine::FontColor::kFontColorOverride);
_renderModePopUp = new PopUpWidget(boss, prefix + "grRenderPopup", _("Special dithering modes supported by some games")); _renderModePopUp = new PopUpWidget(boss, prefix + "grRenderPopup", _("Special dithering modes supported by some games"));
_renderModePopUp->appendEntry(_("<default>"), Common::kRenderDefault); _renderModePopUp->appendEntry(_("<default>"), Common::kRenderDefault);
_renderModePopUp->appendEntry(Common::U32String()); _renderModePopUp->appendEntry(Common::U32String());
@ -1410,6 +1419,8 @@ void OptionsDialog::addGraphicControls(GuiObject *boss, const Common::String &pr
// The Stretch mode popup // The Stretch mode popup
const OSystem::GraphicsMode *sm = g_system->getSupportedStretchModes(); const OSystem::GraphicsMode *sm = g_system->getSupportedStretchModes();
_stretchPopUpDesc = new StaticTextWidget(boss, prefix + "grStretchModePopupDesc", _("Stretch mode:")); _stretchPopUpDesc = new StaticTextWidget(boss, prefix + "grStretchModePopupDesc", _("Stretch mode:"));
if (ConfMan.isKeyTemporary("stretch_mode"))
_stretchPopUpDesc->setFontColor(ThemeEngine::FontColor::kFontColorOverride);
_stretchPopUp = new PopUpWidget(boss, prefix + "grStretchModePopup"); _stretchPopUp = new PopUpWidget(boss, prefix + "grStretchModePopup");
_stretchPopUp->appendEntry(_("<default>")); _stretchPopUp->appendEntry(_("<default>"));