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

List:       kde-commits
Subject:    KDE/kdeedu/marble/src/lib
From:       Frederik Gladhorn <frederik.gladhorn () gmx ! de>
Date:       2008-08-20 21:13:13
Message-ID: 1219266793.702388.18281.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 850156 by gladhorn:

compile on arm


 M  +2 -2      MarbleAbstractFloatItem.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/MarbleAbstractFloatItem.cpp #850155:850156
@@ -503,14 +503,14 @@
                 const qreal dockArea = 60.0; // Alignment area width/height
                 const qreal dockJump = 30.0; // Alignment indicator jump size
                 if ( widget->width()-size().width()-newX < dockArea ) {
-                    newX = qMin(-1.0, size().width()+newX-widget->width());
+                    newX = qMin(qreal(-1.0), size().width()+newX-widget->width());
                     if (d->m_floatItemMoveStartPos.x()<event->pos().x()) {
                         // Indicate change to right alignment with a short jump
                         newX = qMax( newX, -(dockArea-dockJump) );
                     }
                 }
                 if ( widget->height()-size().height()-newY < dockArea ) {
-                    newY = qMin(-1.0,size().height()+newY-widget->height());
+                    newY = qMin(qreal(-1.0),size().height()+newY-widget->height());
                     if (d->m_floatItemMoveStartPos.y()<event->pos().y()) {
                        // Indicate change to bottom alignment with a short jump
                        newY = qMax( newY, -(dockArea-dockJump) );
[prev in list] [next in list] [prev in thread] [next in thread]