From c125fba9d2d36e074d4a2a64963b258188e163d7 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 4 May 2012 18:44:46 +0200
Subject: [PATCH] button mouse-over image change working

---
 files/mygui/CMakeLists.txt           |  2 +-
 files/mygui/core.xml                 |  2 +-
 files/mygui/openmw_book_layout.xml   |  8 ++-
 files/mygui/openmw_images.xml        | 39 -------------
 files/mygui/openmw_resources.xml     | 86 ++++++++++++++++++++++++++++
 files/mygui/openmw_scroll_layout.xml |  9 ++-
 6 files changed, 101 insertions(+), 45 deletions(-)
 delete mode 100644 files/mygui/openmw_images.xml
 create mode 100644 files/mygui/openmw_resources.xml

diff --git a/files/mygui/CMakeLists.txt b/files/mygui/CMakeLists.txt
index 2c380cd7e..f712ea67d 100644
--- a/files/mygui/CMakeLists.txt
+++ b/files/mygui/CMakeLists.txt
@@ -9,7 +9,7 @@ configure_file("${SDIR}/black.png" "${DDIR}/black.png" COPYONLY)
 configure_file("${SDIR}/core.skin" "${DDIR}/core.skin" COPYONLY)
 configure_file("${SDIR}/core.xml" "${DDIR}/core.xml" COPYONLY)
 configure_file("${SDIR}/mwgui.png" "${DDIR}/mwgui.png" COPYONLY)
-configure_file("${SDIR}/openmw_images.xml" "${DDIR}/openmw_images.xml" COPYONLY)
+configure_file("${SDIR}/openmw_resources.xml" "${DDIR}/openmw_resources.xml" COPYONLY)
 configure_file("${SDIR}/openmw_settings.xml" "${DDIR}/openmw_settings.xml" COPYONLY)
 configure_file("${SDIR}/openmw_box.skin.xml" "${DDIR}/openmw_box.skin.xml" COPYONLY)
 configure_file("${SDIR}/openmw_button.skin.xml" "${DDIR}/openmw_button.skin.xml" COPYONLY)
diff --git a/files/mygui/core.xml b/files/mygui/core.xml
index c0a29d1f6..e1fb1b5e2 100644
--- a/files/mygui/core.xml
+++ b/files/mygui/core.xml
@@ -2,7 +2,7 @@
 <MyGUI>
     <MyGUI type="List">
         <List file="core.skin" />
-        <List file="openmw_images.xml" />
+        <List file="openmw_resources.xml" />
         <List file="openmw_layers.xml" />
         <List file="openmw.pointer.xml" />
         <List file="openmw.font.xml" />
diff --git a/files/mygui/openmw_book_layout.xml b/files/mygui/openmw_book_layout.xml
index ccf494860..f43c38b5e 100644
--- a/files/mygui/openmw_book_layout.xml
+++ b/files/mygui/openmw_book_layout.xml
@@ -9,8 +9,12 @@
 
         <Widget type="Button" skin="Next_btn" position="251 220 128 32" name="NextPageBTN"/>
         <Widget type="Button" skin="Prev_btn" position="165 220 128 32" name="PrevPageBTN"/>
-        <Widget type="Button" skin="Take_btn" position="75 220 128 32" name="TakeButton"/>
-        <Widget type="Button" skin="Close_btn" position="360 220 128 32" name="CloseButton"/>
+        <Widget type="Button" skin="ButtonImage" position="75 220 128 32" name="TakeButton">
+            <Property key="ImageResource" value="MenuBook_Take"/>
+        </Widget>
+        <Widget type="Button" skin="ButtonImage" position="360 220 128 32" name="CloseButton">
+            <Property key="ImageResource" value="MenuBook_Close"/>
+        </Widget>
 
         <Widget type="EditBox" skin="MW_BookPage" position_real="0.15 0.1 0.3 0.8" name = "LeftText"/>
         <Widget type="EditBox" skin="MW_BookPage" position_real="0.55 0.1 0.3 0.8" name = "RightText"/>
diff --git a/files/mygui/openmw_images.xml b/files/mygui/openmw_images.xml
deleted file mode 100644
index e149273e2..000000000
--- a/files/mygui/openmw_images.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<MyGUI type="Resource">
-        <Resource type="ResourceImageSet" name="ArrowPointerImage">
-                <Group name="Pointer" texture="textures\tx_cursor.dds" size="32 32">
-                        <Index name="Pointer" >
-                                <Frame point="0 0"/>
-                        </Index>
-                </Group>
-        </Resource>
-        <Resource type="ResourceImageSet" name="HResizePointerImage">
-                <Group name="Pointer" texture="textures\tx_cursormove.dds" size="32 32">
-                        <Index name="Pointer" >
-                                <Frame point="0 0"/>
-                        </Index>
-                </Group>
-        </Resource>
-        <Resource type="ResourceImageSet" name="VResizePointerImage">
-                <Group name="Pointer" texture="mwpointer_vresize.png" size="32 32">
-                        <Index name="Pointer" >
-                                <Frame point="0 0"/>
-                        </Index>
-                </Group>
-        </Resource>
-        <Resource type="ResourceImageSet" name="DResizePointerImage">
-                <Group name="Pointer" texture="mwpointer_dresize1.png" size="32 32">
-                        <Index name="Pointer" >
-                                <Frame point="o o"/>
-                        </Index>
-                </Group>
-        </Resource>
-        <Resource type="ResourceImageSet" name="DResize2PointerImage">
-                <Group name="Pointer" texture="mwpointer_dresize2.png" size="32 32">
-                        <Index name="Pointer" >
-                                <Frame point="0 0"/>
-                        </Index>
-                </Group>
-        </Resource>
-</MyGUI>
diff --git a/files/mygui/openmw_resources.xml b/files/mygui/openmw_resources.xml
new file mode 100644
index 000000000..3dfc82cd1
--- /dev/null
+++ b/files/mygui/openmw_resources.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<MyGUI type="Resource">
+    <Resource type="ResourceImageSet" name="ArrowPointerImage">
+        <Group name="Pointer" texture="textures\tx_cursor.dds" size="32 32">
+            <Index name="Pointer" >
+                <Frame point="0 0"/>
+            </Index>
+        </Group>
+    </Resource>
+    <Resource type="ResourceImageSet" name="HResizePointerImage">
+        <Group name="Pointer" texture="textures\tx_cursormove.dds" size="32 32">
+            <Index name="Pointer" >
+                <Frame point="0 0"/>
+            </Index>
+        </Group>
+    </Resource>
+    <Resource type="ResourceImageSet" name="VResizePointerImage">
+        <Group name="Pointer" texture="mwpointer_vresize.png" size="32 32">
+            <Index name="Pointer" >
+                <Frame point="0 0"/>
+            </Index>
+        </Group>
+    </Resource>
+    <Resource type="ResourceImageSet" name="DResizePointerImage">
+        <Group name="Pointer" texture="mwpointer_dresize1.png" size="32 32">
+            <Index name="Pointer" >
+                <Frame point="o o"/>
+            </Index>
+        </Group>
+    </Resource>
+    <Resource type="ResourceImageSet" name="DResize2PointerImage">
+        <Group name="Pointer" texture="mwpointer_dresize2.png" size="32 32">
+            <Index name="Pointer" >
+                <Frame point="0 0"/>
+            </Index>
+        </Group>
+    </Resource>
+
+    <Resource type="ResourceImageSet" name="MenuBook_Close">
+        <Group name="States" texture="mwgui1" size="128 32">
+            <Index name="disabled">
+                <Frame point="0 0"/>
+            </Index>
+            <Index name="normal">
+                <Frame point="0 0"/>
+            </Index>
+            <Index name="highlighted">
+                <Frame point="128 0"/>
+            </Index>
+            <Index name="pushed">
+                <Frame point="256 0"/>
+            </Index>
+        </Group>
+    </Resource>
+
+    <Resource type="ResourceImageSet" name="MenuBook_Take">
+        <Group name="States" texture="mwgui1" size="128 32">
+            <Index name="disabled">
+                <Frame point="384 0"/>
+            </Index>
+            <Index name="normal">
+                <Frame point="384 0"/>
+            </Index>
+            <Index name="highlighted">
+                <Frame point="0 32"/>
+            </Index>
+            <Index name="pushed">
+                <Frame point="128 32"/>
+            </Index>
+        </Group>
+    </Resource>
+
+
+    <Resource type="ResourceLayout" name="ButtonImage" version="3.2.0">
+        <Widget type="Widget" skin="ButtonEmptySkin" position="20 20 16 16" name="Root">
+            <Property key="TextAlign" value="Center"/>
+            <Property key="FontName" value="Default"/>
+            <Property key="ModeImage" value="true"/>
+            <Widget type="ImageBox" skin="ImageBox" position="0 0 16 16" align="Stretch" name="Image">
+                <Property key="NeedMouse" value="false"/>
+            </Widget>
+        </Widget>
+    </Resource>
+
+</MyGUI>
diff --git a/files/mygui/openmw_scroll_layout.xml b/files/mygui/openmw_scroll_layout.xml
index b396931ed..8e2b1765f 100644
--- a/files/mygui/openmw_scroll_layout.xml
+++ b/files/mygui/openmw_scroll_layout.xml
@@ -7,9 +7,14 @@
     <Widget type="ImageBox" skin="ImageBox" position_real="0 0 1 1" name="ScrollImage">     
         <Property key="ImageTexture" value="textures\scroll.dds"/>
 
-        <Widget type="Button" skin="Take_btn" position="12 18 128 32" name="TakeButton"/>
+        <Widget type="Button" skin="ButtonImage" position="12 18 128 32" name="TakeButton">
+            <Property key="ImageResource" value="MenuBook_Take"/>
+        </Widget>
+
+        <Widget type="Button" skin="ButtonImage" position="418 24 128 32" name="CloseButton">
+            <Property key="ImageResource" value="MenuBook_Close"/>
+        </Widget>
 
-        <Widget type="Button" skin="Close_btn" position="418 24 128 32" name="CloseButton"/>
     </Widget>
 </Widget>