[Kstars-devel] KDE/kdeedu/kstars/kstars

[Jason Harris]

SVN commit 748087 by harris:

Draw user-added obect labels rudely (so they always get drawn, even
when there's a collision).  Also draw these labels last in
SkyMapComposite::draw(), so that they won't be overridden by "normal"
labels.

CCMAIL: kstars-devel at kde.org



 M  +2 -2      skycomponents/skymapcomposite.cpp  
 M  +1 -1      skymapdraw.cpp  


--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/skymapcomposite.cpp #748086:748087
@@ -232,14 +232,14 @@
     //DISABLE_SATELLITES
     //m_Satellites->draw( ks, psky );
 
-    ks->map()->drawObjectLabels( labelObjects(), psky );
-
     m_Horizon->draw( ks, psky );
 
     m_skyLabeler->drawQueuedLabels( ks, psky );
     m_CNames->draw( ks, psky );
     m_Stars->drawLabels( ks, psky );
 
+    ks->map()->drawObjectLabels( labelObjects(), psky );
+
     m_skyMesh->inDraw( false );
 
     //kDebug() << QString("draw took %1 ms").arg( t.elapsed() );
--- trunk/KDE/kdeedu/kstars/kstars/skymapdraw.cpp #748086:748087
@@ -333,7 +333,7 @@
         QPointF o = toScreen( obj );
         if ( ! (o.x() >= 0. && o.x() <= Width && o.y() >= 0. && o.y() <= Height ) ) continue;
 
-        obj->drawNameLabel( psky, o );
+        obj->drawRudeNameLabel( psky, o );
     }
 
     //Attach a label to the centered object