mirror of
https://github.com/libretro/scummvm.git
synced 2025-01-30 23:43:10 +00:00
Fixed builtin theme.
Removed some legacy code. svn-id: r34003
This commit is contained in:
parent
f6ee411784
commit
c611178590
@ -363,16 +363,7 @@ bool ThemeRenderer::addDrawData(const Common::String &data, bool cached) {
|
||||
bool ThemeRenderer::loadTheme(Common::String fileName) {
|
||||
unloadTheme();
|
||||
|
||||
if (fileName != "builtin") {
|
||||
if (ConfMan.hasKey("themepath"))
|
||||
Common::File::addDefaultDirectory(ConfMan.get("themepath"));
|
||||
|
||||
#ifdef DATA_PATH
|
||||
Common::File::addDefaultDirectoryRecursive(DATA_PATH);
|
||||
#endif
|
||||
if (ConfMan.hasKey("extrapath"))
|
||||
Common::File::addDefaultDirectoryRecursive(ConfMan.get("extrapath"));
|
||||
|
||||
if (fileName != "builtin") {
|
||||
if (fileName.hasSuffix(".zip"))
|
||||
ImageMan.addArchive(fileName);
|
||||
else
|
||||
|
@ -189,7 +189,7 @@
|
||||
"/> "
|
||||
"<text font = 'text_default' "
|
||||
"vertical_align = 'center' "
|
||||
"horizontal_align = 'right' "
|
||||
"horizontal_align = 'left' "
|
||||
"/> "
|
||||
"</drawdata> "
|
||||
"<drawdata id = 'popup_hover' cache = false> "
|
||||
@ -208,7 +208,7 @@
|
||||
"/> "
|
||||
"<text font = 'text_hover' "
|
||||
"vertical_align = 'center' "
|
||||
"horizontal_align = 'right' "
|
||||
"horizontal_align = 'left' "
|
||||
"/> "
|
||||
"</drawdata> "
|
||||
"<drawdata id = 'widget_textedit' cache = false> "
|
||||
@ -517,13 +517,13 @@
|
||||
"<widget name = 'mcFontButton' "
|
||||
"type = 'Button' "
|
||||
"/> "
|
||||
"<widget name = 'mcFontPath' "
|
||||
"height = 'Globals.Line.Height' "
|
||||
"/> "
|
||||
"<widget name = 'mcFontClearButton' "
|
||||
"height = 'Globals.Line.Height' "
|
||||
"width = 'Globals.Line.Height' "
|
||||
"/> "
|
||||
"<widget name = 'mcFontPath' "
|
||||
"height = 'Globals.Line.Height' "
|
||||
"/> "
|
||||
"</layout> "
|
||||
"<widget name = 'mcMixedCheckbox' "
|
||||
"type = 'Checkbox' "
|
||||
@ -1054,13 +1054,13 @@
|
||||
"<widget name = 'mcFontButton' "
|
||||
"type = 'Button' "
|
||||
"/> "
|
||||
"<widget name = 'mcFontPath' "
|
||||
"height = 'Globals.Line.Height' "
|
||||
"/> "
|
||||
"<widget name = 'mcFontClearButton' "
|
||||
"height = 'Globals.Line.Height' "
|
||||
"width = 'Globals.Line.Height' "
|
||||
"/> "
|
||||
"<widget name = 'mcFontPath' "
|
||||
"height = 'Globals.Line.Height' "
|
||||
"/> "
|
||||
"</layout> "
|
||||
"<widget name = 'mcMixedCheckbox' "
|
||||
"type = 'Checkbox' "
|
||||
|
Binary file not shown.
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user