From cbc44b33ba01ae4aa4eac7386fcde048b7eeb613 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Kune=C5=A1?= <jirka642@gmail.com>
Date: Sat, 18 Jul 2015 21:29:38 +0200
Subject: [PATCH] define crosshair owned colour in openmw_hud_box.skin.xml

---
 AUTHORS.md                          |  2 +-
 apps/openmw/mwgui/hud.cpp           |  6 ++----
 apps/openmw/mwgui/tooltips.cpp      |  2 +-
 files/mygui/openmw_hud.layout       |  3 +--
 files/mygui/openmw_hud_box.skin.xml | 19 +++++++++++++++++--
 files/mygui/openmw_windows.skin.xml |  5 +++--
 6 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index 7774b5afa..2bd96e3a1 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -52,6 +52,7 @@ Programmers
     jeaye
     Jeffrey Haines (Jyby)
     Jengerer
+    Jiří Kuneš (kunesj)
     Joel Graff (graffy)
     John Blomberg (fstp)
     Jordan Ayers
@@ -59,7 +60,6 @@ Programmers
     Julien Voisin (jvoisin/ap0)
     Karl-Felix Glatzer (k1ll)
     Kevin Poitra (PuppyKevin)
-    kunesj
     Lars Söderberg (Lazaroth)
     lazydev
     Leon Saunders (emoose)
diff --git a/apps/openmw/mwgui/hud.cpp b/apps/openmw/mwgui/hud.cpp
index 0f107f4e3..c8d8b61d5 100644
--- a/apps/openmw/mwgui/hud.cpp
+++ b/apps/openmw/mwgui/hud.cpp
@@ -521,15 +521,13 @@ namespace MWGui
     
     void HUD::setCrosshairOwned(bool owned)
     {
-        MyGUI::Colour red = MyGUI::Colour(1.0, 0, 0);
-        MyGUI::Colour white = MyGUI::Colour(1.0, 1.0, 1.0);
         if(owned)
         {
-            mCrosshair->setColour(red);
+            mCrosshair->changeWidgetSkin("HUD_Crosshair_Owned");
         }
         else
         {
-            mCrosshair->setColour(white);
+            mCrosshair->changeWidgetSkin("HUD_Crosshair");
         }
     }
     
diff --git a/apps/openmw/mwgui/tooltips.cpp b/apps/openmw/mwgui/tooltips.cpp
index a51c68acf..dbf27ad91 100644
--- a/apps/openmw/mwgui/tooltips.cpp
+++ b/apps/openmw/mwgui/tooltips.cpp
@@ -377,7 +377,7 @@ namespace MWGui
         {
             if(checkOwned())
             {
-                mDynamicToolTipBox->changeWidgetSkin("HUD_Box_NoTransp_R");
+                mDynamicToolTipBox->changeWidgetSkin("HUD_Box_NoTransp_Owned");
             }
             else
             {
diff --git a/files/mygui/openmw_hud.layout b/files/mygui/openmw_hud.layout
index dd114097e..97b018469 100644
--- a/files/mygui/openmw_hud.layout
+++ b/files/mygui/openmw_hud.layout
@@ -122,8 +122,7 @@
         </Widget>
 
         <!-- Crosshair -->
-        <Widget type="ImageBox" skin="ImageBox" position="0 0 32 32" align="Center Center" name="Crosshair">
-            <Property key="ImageTexture" value="textures\target.dds"/>
+        <Widget type="ImageBox" skin="HUD_Crosshair" position="0 0 32 32" align="Center Center" name="Crosshair">
         </Widget>
 
         <!-- Basic FPSCounter box -->
diff --git a/files/mygui/openmw_hud_box.skin.xml b/files/mygui/openmw_hud_box.skin.xml
index 7019351bd..dfe717c6f 100644
--- a/files/mygui/openmw_hud_box.skin.xml
+++ b/files/mygui/openmw_hud_box.skin.xml
@@ -32,16 +32,31 @@
 
     </Resource>
     
-    <Resource type="ResourceSkin" name="HUD_Box_NoTransp_R" size="40 40">
+    <Resource type="ResourceSkin" name="HUD_Box_NoTransp_Owned" size="40 40">
 
         <!-- The interior of the box -->
 
-        <Child type="Widget" skin="DialogBG_R" offset="0 0 40 40" align="Stretch" name="Client"/>
+        <Child type="Widget" skin="DialogBG_Owned" offset="0 0 40 40" align="Stretch" name="Client"/>
 
         <!-- Borders -->
 
         <Child type="Widget" skin="MW_Box" offset="0 0 40 40" align="Left Stretch" name="Client"/>
 
     </Resource>
+    
+    <!-- Defines crosshair color -->
+    <Resource type="ResourceSkin" name="HUD_Crosshair" size="32 32" texture="textures\target.dds">
+        <BasisSkin type="MainSkin" offset="0 0 32 32">
+            <State name="normal" offset="0 0 32 32"/>
+        </BasisSkin>
+    </Resource>
+    
+    <!-- Defines owned crosshair color -->
+    <Resource type="ResourceSkin" name="HUD_Crosshair_Owned" size="32 32" texture="textures\target.dds">
+        <Property key="Colour" value="0.9 0 0 1"/>
+        <BasisSkin type="MainSkin" offset="0 0 32 32">
+            <State name="normal" offset="0 0 32 32"/>
+        </BasisSkin>
+    </Resource>
 
 </MyGUI>
diff --git a/files/mygui/openmw_windows.skin.xml b/files/mygui/openmw_windows.skin.xml
index 47f8cada8..c9a1f1ccc 100644
--- a/files/mygui/openmw_windows.skin.xml
+++ b/files/mygui/openmw_windows.skin.xml
@@ -129,9 +129,10 @@
         </BasisSkin>
     </Resource>
     
-    <!-- Defines a red background -->
-    <Resource type="ResourceSkin" name="DialogBG_R" size="8 8" texture="white">
+    <!-- Defines a owned background -->
+    <Resource type="ResourceSkin" name="DialogBG_Owned" size="8 8" texture="white">
         <Property key="Colour" value="0.2 0 0 1"/>
+        <!-- <Property key="Colour" value="#{setting=GUI,color background owned}"/> -->
         <BasisSkin type="MainSkin" offset="0 0 8 8">
             <State name="normal" offset="0 0 8 8"/>
         </BasisSkin>