]> git.mxchange.org Git - flightgear.git/commitdiff
Tweak hover logic.
authorJames Turner <zakalawe@mac.com>
Mon, 11 Mar 2013 17:13:03 +0000 (17:13 +0000)
committerJames Turner <zakalawe@mac.com>
Mon, 11 Mar 2013 17:13:03 +0000 (17:13 +0000)
Fixes tooltips vanishing on mouse-move.

src/Input/FGMouseInput.cxx

index fa3e179034733a77f429b9b6aff4609146bb623f..f7d32778b26235f16e0622d810ec34941bfb1abc 100644 (file)
@@ -195,7 +195,8 @@ public:
       
         FGMouseCursor::Cursor cur = FGMouseCursor::CURSOR_ARROW;
         bool explicitCursor = false;
-        
+        bool didPick = false;
+      
         if (globals->get_renderer()->pick(pickList, windowPos)) {
             
             std::vector<SGSceneryPick>::const_iterator i;
@@ -214,18 +215,21 @@ public:
                 }
                 
                 if (done) {
+                    didPick = true;
                     break;
                 }
             } // of picks iteration
-        } // of have valid pick
+        } else { // of have valid pick
+        }
       
-        
         if (!explicitCursor && (priority == SGPickCallback::PriorityPanel)) {
             cur = FGMouseCursor::CURSOR_HAND;
         }
         
         FGMouseCursor::instance()->setCursor(cur);
-        updateHover();
+        if (!didPick) {
+          updateHover();
+        }
     }
     
     void doMouseMoveWithCallbacks(const osgGA::GUIEventAdapter* ea)