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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/applets
From:       Marijn Kruisselbrink <m.kruisselbrink () student ! tue ! nl>
Date:       2008-06-16 22:20:55
Message-ID: 1213654855.267525.29072.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 821244 by mkruisselbrink:

more fixes for qMax/qMin when qreal != double


 M  +3 -3      battery/battery.cpp  
 M  +1 -1      pager/pager.cpp  


--- trunk/KDE/kdebase/workspace/plasma/applets/battery/battery.cpp #821243:821244
@@ -347,7 +347,7 @@
     } else {
         m_alpha = m_fadeIn ? progress : 1 - progress;
     }
-    m_alpha = qMax(0.0, m_alpha);
+    m_alpha = qMax(qreal(0.0), m_alpha);
     update();
 }
 
@@ -407,7 +407,7 @@
     p->setFont(m_font);
 
     // Let's find a good position for painting the background
-    m_textRect = QRectF(qMax(0.0, contentsRect.left() + (contentsRect.width() - \
text_width) / 2), +    m_textRect = QRectF(qMax(qreal(0.0), contentsRect.left() + \
                (contentsRect.width() - text_width) / 2),
                             contentsRect.top() + ((contentsRect.height() - \
(int)fm.height()) / 2 * 0.9),  qMin(contentsRect.width(), (int)text_width),
                             fm.height() * 1.2 );
@@ -512,7 +512,7 @@
     p->setRenderHint(QPainter::Antialiasing);
 
     if (m_numOfBattery == 0) {
-        QRectF ac_contentsRect(contentsRect.topLeft(), QSizeF(qMax(0.0, \
contentsRect.width() * m_acAlpha), qMax(0.0, contentsRect.height() * m_acAlpha))); +  \
QRectF ac_contentsRect(contentsRect.topLeft(), QSizeF(qMax(qreal(0.0), \
contentsRect.width() * m_acAlpha), qMax(qreal(0.0), contentsRect.height() * \
m_acAlpha)));  if (m_acadapter_plugged) {
             m_theme->paint(p, ac_contentsRect, "AcAdapter");
         }
--- trunk/KDE/kdebase/workspace/plasma/applets/pager/pager.cpp #821243:821244
@@ -613,7 +613,7 @@
             QPointF dest = m_dragCurrentPos - \
m_rects[m_dragHighlightedDesktop].topLeft() - m_dragOriginalPos + \
                m_dragOriginal.topLeft();
             dest = QPointF(dest.x()/m_widthScaleFactor, \
dest.y()/m_heightScaleFactor);  // don't move windows to negative positions
-            dest = QPointF(qMax(dest.x(), 0.0), qMax(dest.y(), 0.0));
+            dest = QPointF(qMax(dest.x(), qreal(0.0)), qMax(dest.y(), qreal(0.0)));
             if( !KWindowSystem::mapViewport()) {
                 KWindowSystem::setOnDesktop(m_dragId, m_dragHighlightedDesktop+1);
                 // use _NET_MOVERESIZE_WINDOW rather than plain move, so that the WM \
knows this is a pager request


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