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

GUI: Compute base scale factor and set it for ThemeParser

Browse source
This commit is contained in:
Eugene Sandulenko 2020-10-26 18:27:06 +01:00
parent 3ab7626e78
commit a0d4162a2b
6 changed files with 56 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
gui/ThemeParser.cpp
View file

@ -126,6 +126,8 @@ ThemeParser::ThemeParser(ThemeEngine *parent) : XMLParser() {
_defaultStepGlobal = defaultDrawStep();
_defaultStepLocal = nullptr;
_theme = parent;
_baseWidth = _baseHeight = 0;
}
ThemeParser::~ThemeParser() {
@ -921,7 +923,7 @@ bool ThemeParser::parseCommonLayoutProps(ParserNode *node, const Common::String
return false;
if (wtoken.lastChar() == '%')
width = g_system->getOverlayWidth() * width / 100;
width = _baseWidth * width / 100;
}
htoken = tokenizer.nextToken();
@ -935,7 +937,7 @@ bool ThemeParser::parseCommonLayoutProps(ParserNode *node, const Common::String
return false;
if (htoken.lastChar() == '%')
height = g_system->getOverlayHeight() * height / 100;
height = _baseHeight * height / 100;
}
if (!tokenizer.empty())
@ -961,7 +963,7 @@ bool ThemeParser::parseCommonLayoutProps(ParserNode *node, const Common::String
if (!_theme->getEvaluator()->hasVar(var + "Width"))
return false;
x = (g_system->getOverlayWidth() / 2) - (_theme->getEvaluator()->getVar(var + "Width") / 2);
x = (_baseWidth / 2) - (_theme->getEvaluator()->getVar(var + "Width") / 2);
} else if (_theme->getEvaluator()->hasVar(xpos)) {
x = _theme->getEvaluator()->getVar(xpos);
@ -972,7 +974,7 @@ bool ThemeParser::parseCommonLayoutProps(ParserNode *node, const Common::String
return false;
if (xpos.lastChar() == 'r')
x = g_system->getOverlayWidth() - x;
x = _baseWidth - x;
}
ypos = tokenizer.nextToken();
@ -981,7 +983,7 @@ bool ThemeParser::parseCommonLayoutProps(ParserNode *node, const Common::String
if (!_theme->getEvaluator()->hasVar(var + "Height"))
return false;
y = (g_system->getOverlayHeight() / 2) - (_theme->getEvaluator()->getVar(var + "Height") / 2);
y = (_baseHeight / 2) - (_theme->getEvaluator()->getVar(var + "Height") / 2);
} else if (_theme->getEvaluator()->hasVar(ypos)) {
y = _theme->getEvaluator()->getVar(ypos);
@ -992,7 +994,7 @@ bool ThemeParser::parseCommonLayoutProps(ParserNode *node, const Common::String
return false;
if (ypos.lastChar() == 'b')
y = g_system->getOverlayHeight() - y;
y = _baseHeight - y;
}
if (!tokenizer.empty())
@ -1046,9 +1048,9 @@ bool ThemeParser::resolutionCheck(const Common::String &resolution) {
}
if (cur[0] == 'x') {
val = g_system->getOverlayWidth();
val = _baseWidth;
} else if (cur[0] == 'y') {
val = g_system->getOverlayHeight();
val = _baseHeight;
} else {
warning("Error parsing theme 'resolution' token '%s'", resolution.c_str());
return false;