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

BACKENDS: Fix window sizing of games that switch between multiple resolutions

Browse source
This commit is contained in:
Colin Snover 2017-10-01 16:23:22 -05:00
parent 24f5d45619
commit 6e157429b7
17 changed files with 287 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

39
engines/engine.cpp
View file

@ -32,6 +32,7 @@
#include "engines/engine.h"
#include "engines/dialogs.h"
#include "engines/util.h"
#include "common/config-manager.h"
#include "common/events.h"
@ -195,35 +196,21 @@ void Engine::initializePath(const Common::FSNode &gamePath) {
}
void initCommonGFX() {
const Common::ConfigManager::Domain *transientDomain = ConfMan.getDomain(Common::ConfigManager::kTransientDomain);
const Common::ConfigManager::Domain *gameDomain = ConfMan.getActiveDomain();
assert(transientDomain);
// Override global scaler with any game-specific define
if (ConfMan.hasKey("gfx_mode")) {
Common::String gfxMode = ConfMan.get("gfx_mode");
g_system->setGraphicsMode(gfxMode.c_str());
}
// Note: The following code deals with the fullscreen / ASR settings. This
// is a bit tricky, because there are three ways the user can affect these
// settings: Via the config file, via the command line, and via in-game
// hotkeys.
// Any global or command line settings already have been applied at the time
// we get here. Hence we only do something
// we get here, so we only do something if the game domain overrides those
// values
if (gameDomain) {
if (gameDomain->contains("aspect_ratio"))
g_system->setFeatureState(OSystem::kFeatureAspectRatioCorrection, ConfMan.getBool("aspect_ratio"));
// (De)activate aspect-ratio correction as determined by the config settings
if (gameDomain && gameDomain->contains("aspect_ratio"))
g_system->setFeatureState(OSystem::kFeatureAspectRatioCorrection, ConfMan.getBool("aspect_ratio"));
if (gameDomain->contains("fullscreen"))
g_system->setFeatureState(OSystem::kFeatureFullscreenMode, ConfMan.getBool("fullscreen"));
// (De)activate fullscreen mode as determined by the config settings
if (gameDomain && gameDomain->contains("fullscreen"))
g_system->setFeatureState(OSystem::kFeatureFullscreenMode, ConfMan.getBool("fullscreen"));
// (De)activate filtering mode as determined by the config settings
if (gameDomain && gameDomain->contains("filtering"))
g_system->setFeatureState(OSystem::kFeatureFilteringMode, ConfMan.getBool("filtering"));
if (gameDomain->contains("filtering"))
g_system->setFeatureState(OSystem::kFeatureFilteringMode, ConfMan.getBool("filtering"));
}
}
// Please leave the splash screen in working order for your releases, even if they're commercial.
@ -285,6 +272,10 @@ void splashScreen() {
splash = true;
}
void initGraphicsModes(const Graphics::ModeList &modes) {
g_system->initSizeHint(modes);
}
void initGraphics(int width, int height, const Graphics::PixelFormat *format) {
g_system->beginGFXTransaction();