[Kstars-devel] kdeedu/kstars/kstars

[Jason Harris]

CVS commit by harris: 

bugfixes:  transient labels are now suppressed when the sky is slewing.  Also, 
if a transient label is active when a key-induced slew starts, the label will 
fade out.  Also, if the mouse remains motionless at the end of a slew, it now 
checks for a transientObject.

CCMAIL: kstars-devel at kde.org


  M +19 -7     skymap.cpp   1.134


--- kdeedu/kstars/kstars/skymap.cpp  #1.133:1.134
@@ -427,4 +427,5 @@ void SkyMap::slotTransientLabel( void ) 
         //mouseMoveEvent calls fadeTransientLabel(), which will fade out the 
         //TransientLabel and then set TransientObject to NULL.
+        if ( ! slewing ) {
         SkyObject *so = objectNearest( mousePoint() );
         
@@ -436,4 +437,5 @@ void SkyMap::slotTransientLabel( void ) 
                 update();
         }
+        }
 }
 
@@ -883,4 +885,10 @@ void SkyMap::slewFocus( void ) {
 
                                 slewing = true;
+                                //since we are slewing, fade out the transient label
+                                if ( transientObject() && ! TransientTimer.isActive() ) {
+                                        //DEBUG
+                                        kdDebug() << "transientObject: " << transientObject()->name() << endl;
+                                        fadeTransientLabel();
+                                }
                                 forceUpdate();
                                 kapp->processEvents(10); //keep up with other stuff
@@ -922,4 +930,8 @@ void SkyMap::slewFocus( void ) {
                 }
 
+                //Start the HoverTimer. if the user leaves the mouse in place after a slew,
+                //we want to attach a label to the nearest object.
+                HoverTimer.start( HOVER_INTERVAL, true );
+                
                 forceUpdate();
         }