summaryrefslogtreecommitdiff
path: root/src/gui/widgets/scrollarea.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-08-03 02:11:25 +0300
committerAndrei Karas <akaras@inbox.ru>2012-08-04 23:57:02 +0300
commit0647852f65598ef9cb9ebff6dfb508e8b1a98c1c (patch)
tree4cc9395e820e60f3d511351b78fe187e897a8c7e /src/gui/widgets/scrollarea.cpp
parentc52472123eb7847b5cee6b1898c42ef25a5466dd (diff)
downloadmanaplus-0647852f65598ef9cb9ebff6dfb508e8b1a98c1c.tar.gz
manaplus-0647852f65598ef9cb9ebff6dfb508e8b1a98c1c.tar.bz2
manaplus-0647852f65598ef9cb9ebff6dfb508e8b1a98c1c.tar.xz
manaplus-0647852f65598ef9cb9ebff6dfb508e8b1a98c1c.zip
Add support for default theme file names.
Diffstat (limited to 'src/gui/widgets/scrollarea.cpp')
-rw-r--r--src/gui/widgets/scrollarea.cpp10
1 files changed, 6 insertions, 4 deletions
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();