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

GUI: Fix scaling for clip values in theme

Browse source 
Fixes DropDownButton
This commit is contained in:
Eugene Sandulenko 2021-04-04 00:24:10 +02:00
parent 5282f4422f
commit a6afdd701a
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gui/ThemeParser.cpp
View file

@ -46,6 +46,7 @@ static const TextDataInfo kTextDataDefaults[] = {
}; };
#define SCALEVALUE(val) (val > 0 ? val * _scaleFactor : val) #define SCALEVALUE(val) (val > 0 ? val * _scaleFactor : val)
#define FORCESCALEVALUE(val) (val * _scaleFactor)
static TextData parseTextDataId(const Common::String &name) { static TextData parseTextDataId(const Common::String &name) {
for (int i = 0; i < kTextDataMAX; ++i) for (int i = 0; i < kTextDataMAX; ++i)
@ -700,10 +701,11 @@ bool ThemeParser::parseDrawStep(ParserNode *stepNode, Graphics::DrawStep *drawst
val = stepNode->values["clip"]; val = stepNode->values["clip"];
int cl, ct, cr, cb; int cl, ct, cr, cb;
if (parseIntegerKey(val, 4, &cl, &ct, &cr, &cb)) { if (parseIntegerKey(val, 4, &cl, &ct, &cr, &cb)) {
drawstep->clip.left = SCALEVALUE(cl); // Values could be less than 0 which is legit
drawstep->clip.top = SCALEVALUE(ct); drawstep->clip.left = FORCESCALEVALUE(cl);
drawstep->clip.right = SCALEVALUE(cr); drawstep->clip.top = FORCESCALEVALUE(ct);
drawstep->clip.bottom = SCALEVALUE(cb); drawstep->clip.right = FORCESCALEVALUE(cr);
drawstep->clip.bottom = FORCESCALEVALUE(cb);
} }
} }