show owned - better settings

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,6 +373,8 @@ namespace MWGui
     {
         mDynamicToolTipBox->setVisible(true);
         
+        if(mShowOwned == 1 || mShowOwned == 3)
+        {
             if(checkOwned())
             {
                 mDynamicToolTipBox->changeWidgetSkin("HUD_Box_NoTransp_R");
@@ -378,6 +383,7 @@ namespace MWGui
             {
                 mDynamicToolTipBox->changeWidgetSkin("HUD_Box_NoTransp");
             }
+        }
 
         std::string caption = info.caption;
         std::string image = info.icon;

apps/openmw/mwgui/tooltips.hpp

@@ -122,6 +122,8 @@ namespace MWGui
         bool mEnabled;
 
         bool mFullHelp;
+        
+        int mShowOwned;
     };
 }
 #endif

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);

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;
 

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>

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 =