From 984c4550279907c432791fdeb07161339f3d1e57 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 26 Nov 2015 18:22:01 +0100
Subject: [PATCH] Fix Show Owned option affecting tooltips that are not objects
 (Fixes #3036)

---
 apps/openmw/mwgui/tooltips.cpp | 18 +++++++++---------
 apps/openmw/mwgui/tooltips.hpp |  3 ++-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwgui/tooltips.cpp b/apps/openmw/mwgui/tooltips.cpp
index 7c7f951af..3356698df 100644
--- a/apps/openmw/mwgui/tooltips.cpp
+++ b/apps/openmw/mwgui/tooltips.cpp
@@ -87,9 +87,9 @@ namespace MWGui
             return;
         }
 
-        bool gameMode = MWBase::Environment::get().getWindowManager()->isGuiMode();
+        bool guiMode = MWBase::Environment::get().getWindowManager()->isGuiMode();
 
-        if (gameMode)
+        if (guiMode)
         {
             const MyGUI::IntPoint& mousePos = MyGUI::InputManager::getInstance().getMousePosition();
 
@@ -112,7 +112,7 @@ namespace MWGui
                     if (info.caption.empty())
                         info.caption=mFocusObject.getCellRef().getRefId();
                     info.icon="";
-                    tooltipSize = createToolTip(info);
+                    tooltipSize = createToolTip(info, true);
                 }
                 else
                     tooltipSize = getToolTipViaPtr(true);
@@ -178,7 +178,7 @@ namespace MWGui
                     ToolTipInfo info;
                     info.text = data.caption;
                     info.notes = data.notes;
-                    tooltipSize = createToolTip(info);
+                    tooltipSize = createToolTip(info, false);
                 }
                 else if (type == "ItemPtr")
                 {
@@ -197,7 +197,7 @@ namespace MWGui
                 }
                 else if (type == "ToolTipInfo")
                 {
-                    tooltipSize = createToolTip(*focus->getUserData<MWGui::ToolTipInfo>());
+                    tooltipSize = createToolTip(*focus->getUserData<MWGui::ToolTipInfo>(), false);
                 }
                 else if (type == "AvatarItemSelection")
                 {
@@ -240,7 +240,7 @@ namespace MWGui
                         info.text = "#{sSchool}: " + sSchoolNames[school];
                     }
                     info.effects = effects;
-                    tooltipSize = createToolTip(info);
+                    tooltipSize = createToolTip(info, false);
                 }
                 else if (type == "Layout")
                 {
@@ -345,7 +345,7 @@ namespace MWGui
             ToolTipInfo info = object.getToolTipInfo(mFocusObject);
             if (!image)
                 info.icon = "";
-            tooltipSize = createToolTip(info);
+            tooltipSize = createToolTip(info, true);
         }
 
         return tooltipSize;
@@ -370,13 +370,13 @@ namespace MWGui
         }
     }
 
-    MyGUI::IntSize ToolTips::createToolTip(const MWGui::ToolTipInfo& info)
+    MyGUI::IntSize ToolTips::createToolTip(const MWGui::ToolTipInfo& info, bool isFocusObject)
     {
         mDynamicToolTipBox->setVisible(true);
         
         if(mShowOwned == 1 || mShowOwned == 3)
         {
-            if(checkOwned())
+            if(isFocusObject && checkOwned())
             {
                 mDynamicToolTipBox->changeWidgetSkin("HUD_Box_NoTransp_Owned");
             }
diff --git a/apps/openmw/mwgui/tooltips.hpp b/apps/openmw/mwgui/tooltips.hpp
index 983b50fe2..fa1ae4f88 100644
--- a/apps/openmw/mwgui/tooltips.hpp
+++ b/apps/openmw/mwgui/tooltips.hpp
@@ -98,8 +98,9 @@ namespace MWGui
         MyGUI::IntSize getToolTipViaPtr (bool image=true);
         ///< @return requested tooltip size
 
-        MyGUI::IntSize createToolTip(const ToolTipInfo& info);
+        MyGUI::IntSize createToolTip(const ToolTipInfo& info, bool isFocusObject);
         ///< @return requested tooltip size
+        /// @param isFocusObject Is the object this tooltips originates from mFocusObject?
 
         float mFocusToolTipX;
         float mFocusToolTipY;