From 0647852f65598ef9cb9ebff6dfb508e8b1a98c1c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 3 Aug 2012 02:11:25 +0300 Subject: Add support for default theme file names. --- src/gui/widgets/scrollarea.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/gui/widgets/scrollarea.cpp') diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp index 6bc75d5a2..2906ab641 100644 --- a/src/gui/widgets/scrollarea.cpp +++ b/src/gui/widgets/scrollarea.cpp @@ -127,7 +127,7 @@ void ScrollArea::init(std::string skinName) if (skinName == "") skinName = "scroll_background.xml"; - Theme::instance()->loadRect(background, skinName); + Theme::instance()->loadRect(background, skinName, "scroll_background.xml"); if (instances == 0) { for (int f = 0; f < 9; f ++) @@ -139,13 +139,15 @@ void ScrollArea::init(std::string skinName) if (Theme::instance()) { - Theme::instance()->loadRect(vMarker, "scroll.xml"); - Theme::instance()->loadRect(vMarkerHi, "scroll_highlighted.xml"); + Theme::instance()->loadRect(vMarker, "scroll.xml", ""); + Theme::instance()->loadRect(vMarkerHi, "scroll_highlighted.xml", + "scroll.xml"); } for (int i = 0; i < 2; i ++) { - Skin *skin = Theme::instance()->load(buttonFiles[i]); + Skin *skin = Theme::instance()->load( + buttonFiles[i], "scrollbuttons.xml"); if (skin) { const ImageRect &rect = skin->getBorder(); -- cgit v1.2.3-70-g09d2