diff options
| -rw-r--r-- | gui/ThemeRenderer.cpp | 6 | ||||
| -rw-r--r-- | gui/themebrowser.cpp | 2 | ||||
| -rw-r--r-- | gui/themes/scummclassic.zip | bin | 40158 -> 40156 bytes | |||
| -rw-r--r-- | gui/themes/scummclassic/classic_gfx.stx | 4 | ||||
| -rw-r--r-- | gui/themes/scummodern.zip | bin | 122841 -> 123105 bytes | |||
| -rw-r--r-- | gui/themes/scummodern/scummodern_gfx.stx | 16 | ||||
| -rw-r--r-- | gui/themes/scummodern/scummodern_layout.stx | 6 |
7 files changed, 23 insertions, 11 deletions
diff --git a/gui/ThemeRenderer.cpp b/gui/ThemeRenderer.cpp index c272de96f9..ab186101b1 100644 --- a/gui/ThemeRenderer.cpp +++ b/gui/ThemeRenderer.cpp @@ -483,9 +483,9 @@ bool ThemeRenderer::loadThemeXML(Common::String themeName) { } } else { #endif - FilesystemNode node(themeName); + + FilesystemNode node(themeName); if (node.exists() && node.isReadable() && node.isDirectory()) { - FSList fslist; if (!node.getChildren(fslist, FilesystemNode::kListFilesOnly)) return false; @@ -795,7 +795,7 @@ void ThemeRenderer::drawPopUpWidget(const Common::Rect &r, const Common::String if (!sel.empty()) { Common::Rect text(r.left, r.top, r.right - 16, r.bottom); - queueDDText(getTextData(dd), text, sel, false, false, _widgets[dd]->_textAlignH, _widgets[dd]->_textAlignV); + queueDDText(getTextData(dd), text, sel, false, false, _widgets[dd]->_textAlignH, _widgets[dd]->_textAlignV, deltax); } } diff --git a/gui/themebrowser.cpp b/gui/themebrowser.cpp index dd15742258..f764b05f6a 100644 --- a/gui/themebrowser.cpp +++ b/gui/themebrowser.cpp @@ -189,7 +189,7 @@ void ThemeBrowser::addDir(ThList &list, const Common::String &dir, int level) { } bool ThemeBrowser::isTheme(const FilesystemNode &node, Entry &out) { - out.file = node.getName(); + out.file = node.getPath(); #ifdef USE_ZLIB if (!out.file.hasSuffix(".zip") && !node.isDirectory()) diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip Binary files differindex 4015f24b93..768d02b7f6 100644 --- a/gui/themes/scummclassic.zip +++ b/gui/themes/scummclassic.zip diff --git a/gui/themes/scummclassic/classic_gfx.stx b/gui/themes/scummclassic/classic_gfx.stx index 6c96dcebdb..d9189743d3 100644 --- a/gui/themes/scummclassic/classic_gfx.stx +++ b/gui/themes/scummclassic/classic_gfx.stx @@ -234,7 +234,7 @@ /> <text font = 'text_default' vertical_align = 'center' - horizontal_align = 'right' + horizontal_align = 'left' /> </drawdata> @@ -255,7 +255,7 @@ /> <text font = 'text_hover' vertical_align = 'center' - horizontal_align = 'right' + horizontal_align = 'left' /> </drawdata> diff --git a/gui/themes/scummodern.zip b/gui/themes/scummodern.zip Binary files differindex a6c3c31625..db728c5169 100644 --- a/gui/themes/scummodern.zip +++ b/gui/themes/scummodern.zip diff --git a/gui/themes/scummodern/scummodern_gfx.stx b/gui/themes/scummodern/scummodern_gfx.stx index 37d6590e3c..c67dcee4d5 100644 --- a/gui/themes/scummodern/scummodern_gfx.stx +++ b/gui/themes/scummodern/scummodern_gfx.stx @@ -300,7 +300,7 @@ /> <text font = 'text_default' vertical_align = 'center' - horizontal_align = 'right' + horizontal_align = 'left' /> </drawdata> @@ -325,7 +325,7 @@ /> <text font = 'text_hover' vertical_align = 'center' - horizontal_align = 'right' + horizontal_align = 'left' /> </drawdata> @@ -472,4 +472,16 @@ shadow = 3 /> </drawdata> + + <drawdata id = 'widget_small' cache = false> + <drawstep func = 'roundedsq' + radius = 8 + stroke = 0 + gradient_start = 'blandyellow' + gradient_end = 'xtrabrightred' + gradient_factor = '6' + fill = 'gradient' + shadow = 3 + /> + </drawdata> </render_info>
\ No newline at end of file diff --git a/gui/themes/scummodern/scummodern_layout.stx b/gui/themes/scummodern/scummodern_layout.stx index 61545d0ffa..9d3c009eff 100644 --- a/gui/themes/scummodern/scummodern_layout.stx +++ b/gui/themes/scummodern/scummodern_layout.stx @@ -261,13 +261,13 @@ <layout type = 'horizontal' padding = '0, 0, 0, 0'> <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' |