Improve theming.

Add support for theming button.

13 files changed, 132 insertions, 63 deletions

diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt
index b262a5ac3..2fefbfe6c 100644
--- a/data/graphics/gui/CMakeLists.txt
+++ b/data/graphics/gui/CMakeLists.txt
@@ -1,10 +1,7 @@
 SET (FILES
     bubble.png
-    button.png
-    button_disabled.png
-    buttonhi.png
+    button.xml
     buttonplay.png
-    buttonpress.png
     checkbox.png
     circle-gray.png
     circle-green.png
diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am
index 6f294fa45..0e3e13a1e 100644
--- a/data/graphics/gui/Makefile.am
+++ b/data/graphics/gui/Makefile.am
@@ -3,11 +3,8 @@ guidir = $(pkgdatadir)/data/graphics/gui
 
 gui_DATA =				\
 	bubble.png			\
-	button.png			\
-	button_disabled.png		\
-	buttonhi.png			\
+	button.xml			\
 	buttonplay.png			\
-	buttonpress.png			\
 	checkbox.png			\
 	circle-gray.png			\
 	circle-green.png		\
diff --git a/data/graphics/gui/button.png b/data/graphics/gui/button.png
deleted file mode 100644
index 9ebbea639..000000000
--- a/data/graphics/gui/button.png
+++ /dev/null
diff --git a/data/graphics/gui/button.xml b/data/graphics/gui/button.xml
new file mode 100644
index 000000000..899030820
--- /dev/null
+++ b/data/graphics/gui/button.xml
@@ -0,0 +1,18 @@
+<skinset name="Default" image="window.png">
+	<widget type="Window" xpos="41" ypos="0">
+		<!-- Top Row -->
+		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="5" />
+		<part type="top-edge" xpos="9" ypos="0" width="8" height="5" />
+		<part type="top-right-corner" xpos="16" ypos="0" width="10" height="5" />
+
+		<!-- Middle Row -->
+		<part type="left-edge" xpos="0" ypos="4" width="10" height="16" />
+		<part type="bg-quad" xpos="9" ypos="4" width="8" height="16" />
+		<part type="right-edge" xpos="16" ypos="4" width="10" height="16" />
+
+		<!-- Bottom Row -->
+		<part type="bottom-left-corner" xpos="0" ypos="19" width="10" height="5" />
+		<part type="bottom-edge" xpos="9" ypos="19" width="8" height="5" />
+		<part type="bottom-right-corner" xpos="16" ypos="19" width="10" height="5" />
+	</widget>
+</skinset>
diff --git a/data/graphics/gui/button_disabled.png b/data/graphics/gui/button_disabled.png
deleted file mode 100644
index 0ce3aa6ff..000000000
--- a/data/graphics/gui/button_disabled.png
+++ /dev/null
diff --git a/data/graphics/gui/button_disabled.xml b/data/graphics/gui/button_disabled.xml
new file mode 100644
index 000000000..8194bf4d5
--- /dev/null
+++ b/data/graphics/gui/button_disabled.xml
@@ -0,0 +1,18 @@
+<skinset name="Default" image="window.png">
+	<widget type="Window" xpos="41" ypos="75">
+		<!-- Top Row -->
+		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="5" />
+		<part type="top-edge" xpos="9" ypos="0" width="8" height="5" />
+		<part type="top-right-corner" xpos="16" ypos="0" width="10" height="5" />
+
+		<!-- Middle Row -->
+		<part type="left-edge" xpos="0" ypos="4" width="10" height="16" />
+		<part type="bg-quad" xpos="9" ypos="4" width="8" height="16" />
+		<part type="right-edge" xpos="16" ypos="4" width="10" height="16" />
+
+		<!-- Bottom Row -->
+		<part type="bottom-left-corner" xpos="0" ypos="19" width="10" height="5" />
+		<part type="bottom-edge" xpos="9" ypos="19" width="8" height="5" />
+		<part type="bottom-right-corner" xpos="16" ypos="19" width="10" height="5" />
+	</widget>
+</skinset>
diff --git a/data/graphics/gui/button_highlighted.xml b/data/graphics/gui/button_highlighted.xml
new file mode 100644
index 000000000..356cee5ce
--- /dev/null
+++ b/data/graphics/gui/button_highlighted.xml
@@ -0,0 +1,18 @@
+<skinset name="Default" image="window.png">
+	<widget type="Window" xpos="41" ypos="25">
+		<!-- Top Row -->
+		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="5" />
+		<part type="top-edge" xpos="9" ypos="0" width="8" height="5" />
+		<part type="top-right-corner" xpos="16" ypos="0" width="10" height="5" />
+
+		<!-- Middle Row -->
+		<part type="left-edge" xpos="0" ypos="4" width="10" height="16" />
+		<part type="bg-quad" xpos="9" ypos="4" width="8" height="16" />
+		<part type="right-edge" xpos="16" ypos="4" width="10" height="16" />
+
+		<!-- Bottom Row -->
+		<part type="bottom-left-corner" xpos="0" ypos="19" width="10" height="5" />
+		<part type="bottom-edge" xpos="9" ypos="19" width="8" height="5" />
+		<part type="bottom-right-corner" xpos="16" ypos="19" width="10" height="5" />
+	</widget>
+</skinset>
diff --git a/data/graphics/gui/button_pressed.xml b/data/graphics/gui/button_pressed.xml
new file mode 100644
index 000000000..bd9de9e28
--- /dev/null
+++ b/data/graphics/gui/button_pressed.xml
@@ -0,0 +1,18 @@
+<skinset name="Default" image="window.png">
+	<widget type="Window" xpos="41" ypos="50">
+		<!-- Top Row -->
+		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="5" />
+		<part type="top-edge" xpos="9" ypos="0" width="8" height="5" />
+		<part type="top-right-corner" xpos="16" ypos="0" width="10" height="5" />
+
+		<!-- Middle Row -->
+		<part type="left-edge" xpos="0" ypos="4" width="10" height="16" />
+		<part type="bg-quad" xpos="9" ypos="4" width="8" height="16" />
+		<part type="right-edge" xpos="16" ypos="4" width="10" height="16" />
+
+		<!-- Bottom Row -->
+		<part type="bottom-left-corner" xpos="0" ypos="19" width="10" height="5" />
+		<part type="bottom-edge" xpos="9" ypos="19" width="8" height="5" />
+		<part type="bottom-right-corner" xpos="16" ypos="19" width="10" height="5" />
+	</widget>
+</skinset>
diff --git a/data/graphics/gui/buttonhi.png b/data/graphics/gui/buttonhi.png
deleted file mode 100644
index c47726346..000000000
--- a/data/graphics/gui/buttonhi.png
+++ /dev/null
diff --git a/data/graphics/gui/buttonpress.png b/data/graphics/gui/buttonpress.png
deleted file mode 100644
index e9cd17653..000000000
--- a/data/graphics/gui/buttonpress.png
+++ /dev/null
diff --git a/data/graphics/gui/window.png b/data/graphics/gui/window.png
index f0ef1af4b..a0d5da63c 100644
--- a/data/graphics/gui/window.png
+++ b/data/graphics/gui/window.png
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 704a1f939..779d98768 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -307,15 +307,33 @@ void Theme::optionChanged(const std::string &)
     updateAlpha();
 }
 
-#define loadSkinSubImage(object, name) \
+#define loadSkinImage(obj, name) \
     if (partType == name) \
     { \
         if (dBorders) \
-            object = dBorders->getSubImage(xPos, yPos, width, height); \
+        { \
+            border.grid[obj] = dBorders->getSubImage( \
+                xPos, yPos, width, height); \
+        } \
         else \
-            object = nullptr; \
+        { \
+            border.grid[obj] = nullptr; \
+        } \
     }
 
+#define loadSkinImage2(obj, name1, name2) \
+    if (partType == name1 || partType == name2) \
+    { \
+        if (dBorders) \
+        { \
+            border.grid[obj] = dBorders->getSubImage( \
+                xPos, yPos, width, height); \
+        } \
+        else \
+        { \
+            border.grid[obj] = nullptr; \
+        } \
+    }
 
 Skin *Theme::readSkin(const std::string &filename)
 {
@@ -360,35 +378,38 @@ Skin *Theme::readSkin(const std::string &filename)
                 XML::getProperty(widgetNode, "type", "unknown");
         if (widgetType == "Window")
         {
+            const int globalXPos = XML::getProperty(widgetNode, "xpos", 0);
+            const int globalYPos = XML::getProperty(widgetNode, "ypos", 0);
             for_each_xml_child_node(partNode, widgetNode)
             {
                 if (xmlNameEqual(partNode, "part"))
                 {
                     const std::string partType =
                             XML::getProperty(partNode, "type", "unknown");
-                    // TOP ROW
-                    const int xPos = XML::getProperty(partNode, "xpos", 0);
-                    const int yPos = XML::getProperty(partNode, "ypos", 0);
+                    const int xPos = XML::getProperty(
+                        partNode, "xpos", 0) + globalXPos;
+                    const int yPos = XML::getProperty(
+                        partNode, "ypos", 0) + globalYPos;
                     const int width = XML::getProperty(partNode, "width", 1);
                     const int height = XML::getProperty(partNode, "height", 1);
 
-                        loadSkinSubImage(border.grid[0], "top-left-corner")
+                        loadSkinImage2(0, "top-left-corner", "standart")
                     else
-                        loadSkinSubImage(border.grid[1], "top-edge")
+                        loadSkinImage2(1, "top-edge", "highlighted")
                     else
-                        loadSkinSubImage(border.grid[2], "top-right-corner")
+                        loadSkinImage2(2, "top-right-corner", "pressed")
                     else
-                        loadSkinSubImage(border.grid[3], "left-edge")
+                        loadSkinImage2(3, "left-edge", "disabled")
                     else
-                        loadSkinSubImage(border.grid[4], "bg-quad")
+                        loadSkinImage(4, "bg-quad")
                     else
-                        loadSkinSubImage(border.grid[5], "right-edge")
+                        loadSkinImage(5, "right-edge")
                     else
-                        loadSkinSubImage(border.grid[6], "bottom-left-corner")
+                        loadSkinImage(6, "bottom-left-corner")
                     else
-                        loadSkinSubImage(border.grid[7], "bottom-edge")
+                        loadSkinImage(7, "bottom-edge")
                     else
-                        loadSkinSubImage(border.grid[8], "bottom-right-corner")
+                        loadSkinImage(8, "bottom-right-corner")
                 }
                 else if (xmlNameEqual(partNode, "option"))
                 {
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index 15af963b0..990faaaeb 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -55,19 +55,12 @@ enum
     BUTTON_COUNT         // 4 - Must be last.
 };
 
-struct ButtonData
+static std::string const data[BUTTON_COUNT] =
 {
-    char const *file;
-    int gridX;
-    int gridY;
-};
-
-static ButtonData const data[BUTTON_COUNT] =
-{
-    { "button.png", 0, 0 },
-    { "buttonhi.png", 9, 4 },
-    { "buttonpress.png", 16, 19 },
-    { "button_disabled.png", 25, 23 }
+    "button.xml",
+    "button_highlighted.xml",
+    "button_pressed.xml",
+    "button_disabled.xml"
 };
 
 ImageRect Button::button[BUTTON_COUNT];
@@ -183,29 +176,29 @@ void Button::init()
         // Load the skin
         Image *btn[BUTTON_COUNT];
 
-        int a, x, y, mode;
-
-        for (mode = 0; mode < BUTTON_COUNT; mode++)
+        if (Theme::instance())
         {
-            btn[mode] = Theme::getImageFromTheme(data[mode].file);
-            if (!btn[mode])
-                continue;
-
-            a = 0;
-            for (y = 0; y < 3; y++)
+            for (int mode = 0; mode < BUTTON_COUNT; mode ++)
             {
-                for (x = 0; x < 3; x++)
+                Skin *skin = Theme::instance()->load(data[mode]);
+                if (skin)
                 {
-                    button[mode].grid[a] = btn[mode]->getSubImage(
-                            data[x].gridX, data[y].gridY,
-                            data[x + 1].gridX - data[x].gridX + 1,
-                            data[y + 1].gridY - data[y].gridY + 1);
-                    a++;
+                    const ImageRect &rect = skin->getBorder();
+
+                    for (int f = 0; f < 9; f ++)
+                    {
+                        if (rect.grid[f])
+                        {
+                            rect.grid[f]->incRef();
+                            button[mode].grid[f] = rect.grid[f];
+                        }
+                    }
+
+                    Theme::instance()->unload(skin);
                 }
             }
-            if (btn[mode])
-                btn[mode]->decRef();
         }
+
         updateAlpha();
     }
     mEnabledColor = Theme::getThemeColor(Theme::BUTTON);
@@ -220,17 +213,6 @@ Button::~Button()
 
     delete mVertexes;
     mVertexes = nullptr;
-    if (mInstances == 0)
-    {
-        for (int mode = 0; mode < BUTTON_COUNT; mode++)
-        {
-            if (button[mode].grid)
-            {
-                for_each(button[mode].grid,
-                         button[mode].grid + 9, dtor<Image*>());
-            }
-        }
-    }
     if (mImageSet)
     {
         mImageSet->decRef();