[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kalziumkde4: kdeedu/kalzium/src
From:       Carsten Niehaus <cniehaus () gmx ! de>
Date:       2005-03-08 11:07:04
Message-ID: 20050308110704.6A911103CB () office ! kde ! org
[Download RAW message or body]

CVS commit by cniehaus: 

* now you can see the elements while being in highlightmode
* improved the positions of the values inside the elements


  M +9 -6      element.cpp   1.8.2.20


--- kdeedu/kalzium/src/element.cpp  #1.8.2.19:1.8.2.20
@@ -283,11 +283,11 @@ void Element::drawStateOfMatter( QPainte
         p->setPen( Qt::black );
         text = QString::number( strippedWeight( weight( ) ) );
-        p->drawText( X+2,Y ,ELEMENTSIZE-2,h_small,Qt::AlignLeft, text );
+        p->drawText( X+5,Y+2 ,ELEMENTSIZE-2,h_small,Qt::AlignLeft, text );
 
         text = QString::number( number() );
-        p->drawText( X + 2,( y )*ELEMENTSIZE - h_small, ELEMENTSIZE-2, h_small,Qt::AlignLeft, text );
+        p->drawText( X+5,( y )*ELEMENTSIZE - h_small, ELEMENTSIZE-2, h_small,Qt::AlignLeft, text );
 
         p->setFont( symbol_font );
-        p->drawText( X,Y, ELEMENTSIZE,ELEMENTSIZE,Qt::AlignCenter, symbol() );
+        p->drawText( X+5,Y+2, ELEMENTSIZE,ELEMENTSIZE,Qt::AlignCenter, symbol() );
         
         //border
@@ -351,4 +351,7 @@ void Element::drawHighlight( QPainter* p
 
         p->fillRect( X, Y,ELEMENTSIZE,ELEMENTSIZE, Qt::red );
+
+        //now draw the elements over the red area
+        drawSelf( p, false );
 }
         
@@ -398,11 +401,11 @@ void Element::drawSelf( QPainter* p, boo
         p->setPen( Qt::black );
         text = QString::number( strippedWeight( weight( ) ) );
-        p->drawText( X+2,Y ,ELEMENTSIZE-2,h_small,Qt::AlignLeft, text );
+        p->drawText( X+5,Y+2 ,ELEMENTSIZE+4,h_small,Qt::AlignLeft, text );
 
         text = QString::number( number() );
-        p->drawText( X + 2,( y )*ELEMENTSIZE - h_small, ELEMENTSIZE-2, h_small,Qt::AlignLeft, text );
+        p->drawText( X+5,( y )*ELEMENTSIZE - h_small, ELEMENTSIZE-2, h_small,Qt::AlignLeft, text );
 
         p->setFont( symbol_font );
-        p->drawText( X,Y, ELEMENTSIZE,ELEMENTSIZE,Qt::AlignCenter, symbol() );
+        p->drawText( X+5,Y+2, ELEMENTSIZE,ELEMENTSIZE,Qt::AlignCenter, symbol() );
         
         //border


[prev in list] [next in list] [prev in thread] [next in thread]