From 75f59728984df63a43d9eaa2e42dee572738cb70 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 17:13:20 +0200
Subject: [PATCH] show owned - better settings

---
 apps/openmw/mwgui/tooltips.cpp         | 18 ++++++++++++------
 apps/openmw/mwgui/tooltips.hpp         |  2 ++
 apps/openmw/mwgui/windowmanagerimp.cpp |  6 +++---
 apps/openmw/mwgui/windowmanagerimp.hpp |  2 +-
 files/mygui/openmw_windows.skin.xml    |  2 +-
 files/settings-default.cfg             |  8 ++++++--
 6 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/apps/openmw/mwgui/tooltips.cpp b/apps/openmw/mwgui/tooltips.cpp
index e901714a5..a51c68acf 100644
--- a/apps/openmw/mwgui/tooltips.cpp
+++ b/apps/openmw/mwgui/tooltips.cpp
@@ -38,6 +38,7 @@ namespace MWGui
         , mLastMouseY(0)
         , mEnabled(true)
         , mFullHelp(false)
+        , mShowOwned(0)
     {
         getWidget(mDynamicToolTipBox, "DynamicToolTipBox");
 
@@ -55,6 +56,8 @@ namespace MWGui
         {
             mMainWidget->getChildAt(i)->setVisible(false);
         }
+        
+        mShowOwned = Settings::Manager::getInt("show owned", "Game");
     }
 
     void ToolTips::setEnabled(bool enabled)
@@ -370,13 +373,16 @@ namespace MWGui
     {
         mDynamicToolTipBox->setVisible(true);
         
-        if(checkOwned())
+        if(mShowOwned == 1 || mShowOwned == 3)
         {
-            mDynamicToolTipBox->changeWidgetSkin("HUD_Box_NoTransp_R");
-        }
-        else
-        {
-            mDynamicToolTipBox->changeWidgetSkin("HUD_Box_NoTransp");
+            if(checkOwned())
+            {
+                mDynamicToolTipBox->changeWidgetSkin("HUD_Box_NoTransp_R");
+            }
+            else
+            {
+                mDynamicToolTipBox->changeWidgetSkin("HUD_Box_NoTransp");
+            }
         }
 
         std::string caption = info.caption;
diff --git a/apps/openmw/mwgui/tooltips.hpp b/apps/openmw/mwgui/tooltips.hpp
index bd4a81c32..b2f172076 100644
--- a/apps/openmw/mwgui/tooltips.hpp
+++ b/apps/openmw/mwgui/tooltips.hpp
@@ -122,6 +122,8 @@ namespace MWGui
         bool mEnabled;
 
         bool mFullHelp;
+        
+        int mShowOwned;
     };
 }
 #endif
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 44eed6623..7b618efa7 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -187,7 +187,7 @@ namespace MWGui
       , mRestAllowed(true)
       , mFPS(0.0f)
       , mFallbackMap(fallbackMap)
-      , mShowOwned(false)
+      , mShowOwned(0)
       , mVersionDescription(versionDescription)
     {
         float uiScale = Settings::Manager::getFloat("scaling factor", "GUI");
@@ -264,7 +264,7 @@ namespace MWGui
         MyGUI::ClipboardManager::getInstance().eventClipboardChanged += MyGUI::newDelegate(this, &WindowManager::onClipboardChanged);
         MyGUI::ClipboardManager::getInstance().eventClipboardRequested += MyGUI::newDelegate(this, &WindowManager::onClipboardRequested);
 
-        mShowOwned = Settings::Manager::getBool("show owned", "Game");
+        mShowOwned = Settings::Manager::getInt("show owned", "Game");
     }
 
     void WindowManager::initUI()
@@ -1043,7 +1043,7 @@ namespace MWGui
     {
         mToolTips->setFocusObject(focus);
 
-        if(mShowOwned && mHud)
+        if(mHud && (mShowOwned == 2 || mShowOwned == 3))
         {
             bool owned = mToolTips->checkOwned();
             mHud->setCrosshairOwned(owned);
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index 7dae50209..af82c27c0 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -487,7 +487,7 @@ namespace MWGui
 
     std::map<std::string, std::string> mFallbackMap;
     
-    bool mShowOwned;
+    int mShowOwned;
 
     std::string mVersionDescription;
 
diff --git a/files/mygui/openmw_windows.skin.xml b/files/mygui/openmw_windows.skin.xml
index 29299dc06..47f8cada8 100644
--- a/files/mygui/openmw_windows.skin.xml
+++ b/files/mygui/openmw_windows.skin.xml
@@ -131,7 +131,7 @@
     
     <!-- Defines a red background -->
     <Resource type="ResourceSkin" name="DialogBG_R" size="8 8" texture="white">
-        <Property key="Colour" value="0.3 0 0 1"/>
+        <Property key="Colour" value="0.2 0 0 1"/>
         <BasisSkin type="MainSkin" offset="0 0 8 8">
             <State name="normal" offset="0 0 8 8"/>
         </BasisSkin>
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 4ec0c2480..d84291a24 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -162,8 +162,12 @@ best attack = false
 
 difficulty = 0
 
-# change crosshair color when pointing on owned object
-show owned = false
+# Change crosshair/toolTip color when pointing on owned object
+#0: nothing changed
+#1: tint toolTip
+#2: tint crosshair
+#3: both
+show owned = 0
 
 [Saves]
 character =