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

GUI: Added SVG support to theme parser

Browse source
This commit is contained in:
Eugene Sandulenko 2021-04-04 21:48:07 +02:00
parent 37982f9eb4
commit 55ae2e4367
4 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gui/ThemeParser.cpp
View file

@ -298,7 +298,11 @@ bool ThemeParser::parserCallback_bitmap(ParserNode *node) {
return true; return true;
} }
if (!_theme->addBitmap(node->values["filename"])) Common::String scalableFile;
if (node->values.contains("scalable_file"))
scalableFile = node->values["scalable_file"];
if (!_theme->addBitmap(node->values["filename"], scalableFile))
return parserError("Error loading Bitmap file '" + node->values["filename"] + "'"); return parserError("Error loading Bitmap file '" + node->values["filename"] + "'");
return true; return true;

1
gui/ThemeParser.h
View file

@ -91,6 +91,7 @@ protected:
XML_KEY(bitmap) XML_KEY(bitmap)
XML_PROP(filename, true) XML_PROP(filename, true)
XML_PROP(resolution, false) XML_PROP(resolution, false)
XML_PROP(scalable_file, false)
KEY_END() KEY_END()
XML_KEY(alphabitmap) XML_KEY(alphabitmap)
XML_PROP(filename, true) XML_PROP(filename, true)

2
gui/themes/scummremastered/remastered_gfx.stx
View file

@ -102,7 +102,7 @@
</palette> </palette>
<bitmaps> <bitmaps>
<bitmap filename = 'logo.bmp'/> <bitmap filename = 'logo.bmp' scalable_file = 'logo.svg'/>
<bitmap filename = 'cursor.bmp'/> <bitmap filename = 'cursor.bmp'/>
<bitmap filename = 'cursor_small.bmp'/> <bitmap filename = 'cursor_small.bmp'/>
<bitmap filename = 'checkbox.bmp'/> <bitmap filename = 'checkbox.bmp'/>

2
gui/themes/scummtheme.py
View file

@ -5,7 +5,7 @@ import re
import os import os
import zipfile import zipfile
THEME_FILE_EXTENSIONS = ('.stx', '.bmp', '.fcc', '.ttf', '.png') THEME_FILE_EXTENSIONS = ('.stx', '.bmp', '.fcc', '.ttf', '.png', '.svg')
def buildTheme(themeName): def buildTheme(themeName):
if not os.path.isdir(themeName) or not os.path.isfile(os.path.join(themeName, "THEMERC")): if not os.path.isdir(themeName) or not os.path.isfile(os.path.join(themeName, "THEMERC")):