From 9b31b6272f1ae79820f7fe250695773d0f984c07 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 21 Mar 2012 16:07:56 +0100
Subject: [PATCH] fixed the mouse cursors and fixed MWAttribute & MWSkill

---
 apps/openmw/mwgui/widgets.cpp                 | 37 +++++++++++++------
 extern/mygui_3.0.1/CMakeLists.txt             |  2 +
 extern/mygui_3.0.1/openmw_resources/core.xml  | 19 +++++-----
 .../openmw_resources/openmw.pointer.xml       | 36 +++++++++++++-----
 4 files changed, 63 insertions(+), 31 deletions(-)

diff --git a/apps/openmw/mwgui/widgets.cpp b/apps/openmw/mwgui/widgets.cpp
index 3e73cd2e1..74603aaf1 100644
--- a/apps/openmw/mwgui/widgets.cpp
+++ b/apps/openmw/mwgui/widgets.cpp
@@ -101,12 +101,19 @@ void MWSkill::initialiseOverride()
 
     MyGUI::ButtonPtr button;
     assignWidget(button, "StatNameButton");
-    //skillNameWidget = button; // ???
-    button->eventMouseButtonClick += MyGUI::newDelegate(this, &MWSkill::onClicked);
+    if (button)
+    {
+        skillNameWidget = button;
+        button->eventMouseButtonClick += MyGUI::newDelegate(this, &MWSkill::onClicked);
+    }
 
-    assignWidget(button, "StatValue");
-    //skillNameWidget = button; // ???
-    button->eventMouseButtonClick += MyGUI::newDelegate(this, &MWSkill::onClicked);
+    button = 0;
+    assignWidget(button, "StatValueButton");
+    if (button)
+    {
+        skillNameWidget = button;
+        button->eventMouseButtonClick += MyGUI::newDelegate(this, &MWSkill::onClicked);
+    }
 }
 
 /* MWAttribute */
@@ -183,16 +190,22 @@ void MWAttribute::initialiseOverride()
 
     assignWidget(attributeNameWidget, "StatName");
     assignWidget(attributeValueWidget, "StatValue");
-
+    
     MyGUI::ButtonPtr button;
     assignWidget(button, "StatNameButton");
-    //attributeNameWidget = button; // ???
-    button->eventMouseButtonClick += MyGUI::newDelegate(this, &MWAttribute::onClicked);
-
-    assignWidget(button, "StatValue");
-    //attributeNameWidget = button; // ???
-    button->eventMouseButtonClick += MyGUI::newDelegate(this, &MWAttribute::onClicked);
+    if (button)
+    {
+        attributeNameWidget = button;
+        button->eventMouseButtonClick += MyGUI::newDelegate(this, &MWAttribute::onClicked);
+    }
 
+    button = 0;
+    assignWidget(button, "StatValueButton");
+    if (button)
+    {
+        attributeValueWidget = button;
+        button->eventMouseButtonClick += MyGUI::newDelegate(this, &MWAttribute::onClicked);
+    }
 }
 
 /* MWSpell */
diff --git a/extern/mygui_3.0.1/CMakeLists.txt b/extern/mygui_3.0.1/CMakeLists.txt
index 9cba61344..b746587f5 100644
--- a/extern/mygui_3.0.1/CMakeLists.txt
+++ b/extern/mygui_3.0.1/CMakeLists.txt
@@ -11,6 +11,8 @@ configure_file("${SDIR}/core.skin" "${DDIR}/core.skin" COPYONLY)
 configure_file("${SDIR}/core.xml" "${DDIR}/core.xml" COPYONLY)
 configure_file("${SDIR}/mwpointer.png" "${DDIR}/mwpointer.png" 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_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)
 configure_file("${SDIR}/openmw_list.skin.xml" "${DDIR}/openmw_list.skin.xml" COPYONLY)
diff --git a/extern/mygui_3.0.1/openmw_resources/core.xml b/extern/mygui_3.0.1/openmw_resources/core.xml
index e98b20d3a..30e01a8f3 100644
--- a/extern/mygui_3.0.1/openmw_resources/core.xml
+++ b/extern/mygui_3.0.1/openmw_resources/core.xml
@@ -2,13 +2,13 @@
 
 <MyGUI>
 
-    <MyGUI type="List">
-	    <List file="core.skin" group="General"/>
-
-	    <List file="openmw_layers.xml" group="General"/>
-	    <List file="openmw.pointer.xml" group="General"/>
-	    <List file="openmw.font.xml" group="General"/>
-	    <List file="openmw_text.skin.xml" group="General"/>
+      <MyGUI type="List">
+            <List file="core.skin" group="General"/>
+            <List file="openmw_images.xml" group="General"/>
+            <List file="openmw_layers.xml" group="General"/>
+            <List file="openmw.pointer.xml" group="General"/>
+            <List file="openmw.font.xml" group="General"/>
+            <List file="openmw_text.skin.xml" group="General"/>
             <List file="openmw_windows.skin.xml" group="General"/>
             <List file="openmw_button.skin.xml" group="General"/>
             <List file="openmw_list.skin.xml" group="General"/>
@@ -20,7 +20,8 @@
             <List file="openmw_mainmenu_skin.xml" group="General"/>
             <List file="openmw_console.skin.xml" group="General"/>
             <List file="openmw_journal_skin.xml" group="General"/>
-			<List file="openmw_dialogue_window_skin.xml" group="General"/>
-    </MyGUI>
+            <List file="openmw_dialogue_window_skin.xml" group="General"/>
+            <List file="openmw_settings.xml" group="General"/>
+      </MyGUI>
 
 </MyGUI>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw.pointer.xml b/extern/mygui_3.0.1/openmw_resources/openmw.pointer.xml
index b91f7091a..0fbef2fdf 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw.pointer.xml
+++ b/extern/mygui_3.0.1/openmw_resources/openmw.pointer.xml
@@ -1,13 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<MyGUI type="Pointer">
-
-    <Pointer layer="Pointer" texture="mwpointer.png" default="arrow">
-        <Info name="arrow" point="7 0" size="32 32" offset="0 0 32 32"/>
-        <Info name="hresize" point="16 14" size="32 32" offset="32 0 32 32"/>
-        <Info name="vresize" point="17 16" size="32 32" offset="0 32 32 32"/>
-        <Info name="dresize" point="17 15" size="32 32" offset="32 32 32 32"/>
-        <Info name="dresize2" point="15 15" size="32 32" offset="64 32 32 32"/>
-    </Pointer>
-
+<MyGUI type="Resource">
+	<Resource type="ResourceImageSetPointer" name="arrow">
+		<Property key="Point" value="7 0"/>
+		<Property key="Size" value="32 32"/>
+		<Property key="Resource" value="ArrowPointerImage"/>
+	</Resource>
+	<Resource type="ResourceImageSetPointer" name="hresize">
+		<Property key="Point" value="16 14"/>
+		<Property key="Size" value="32 32"/>
+		<Property key="Resource" value="HResizePointerImage"/>
+	</Resource>
+	<Resource type="ResourceImageSetPointer" name="vresize">
+		<Property key="Point" value="17 16"/>
+		<Property key="Size" value="32 32"/>
+		<Property key="Resource" value="VResizePointerImage"/>
+	</Resource>
+	<Resource type="ResourceImageSetPointer" name="dresize">
+		<Property key="Point" value="17 15"/>
+		<Property key="Size" value="32 32"/>
+		<Property key="Resource" value="DResizePointerImage"/>
+	</Resource>
+	<Resource type="ResourceImageSetPointer" name="dresize2">
+		<Property key="Point" value="15 15"/>
+		<Property key="Size" value="32 32"/>
+		<Property key="Resource" value="DResize2PointerImage"/>
+	</Resource>
 </MyGUI>