]> git.mxchange.org Git - flightgear.git/commitdiff
Make tooltips independent of cursor auto-hide.
authorJames Turner <zakalawe@mac.com>
Sun, 10 Mar 2013 10:17:27 +0000 (10:17 +0000)
committerJames Turner <zakalawe@mac.com>
Sun, 10 Mar 2013 10:17:27 +0000 (10:17 +0000)
src/Input/FGMouseInput.cxx

index aee4f231a68fa2743e1345fa6dd6561bc807d175..97cc1b5da7b13458953d8835b667bb56cc7cf1ba 100644 (file)
@@ -387,17 +387,17 @@ void FGMouseInput::update ( double dt )
     }
   }
 
+  // if delay is <= 0, disable tooltips
+  if ( !d->tooltipTimeoutDone &&
+      (d->tooltipDelayMsec > 0) &&
+      (m.timeSinceLastMove.elapsedMSec() > d->tooltipDelayMsec))
+  {
+      d->tooltipTimeoutDone = true;
+      SGPropertyNode_ptr arg(new SGPropertyNode);
+      globals->get_commands()->execute("tooltip-timeout", arg);
+  }
+  
   if ( d->hideCursor ) {
-      // if delay is <= 0, disable tooltips
-      if ( !d->tooltipTimeoutDone &&
-           (d->tooltipDelayMsec > 0) &&
-           (m.timeSinceLastMove.elapsedMSec() > d->tooltipDelayMsec))
-      {
-          d->tooltipTimeoutDone = true;
-          SGPropertyNode_ptr arg(new SGPropertyNode);
-          globals->get_commands()->execute("tooltip-timeout", arg);
-      }
-    
       if ( m.timeSinceLastMove.elapsedMSec() > d->cursorTimeoutMsec) {
           FGMouseCursor::instance()->hideCursorUntilMouseMove();
           m.timeSinceLastMove.stamp();