From 69eccb04ce510abc62041a20579018bb3007a879 Mon Sep 17 00:00:00 2001
From: Ambroz Bizjak <ambrop7@gmail.com>
Date: Wed, 24 Dec 2008 21:23:27 +0000
Subject: [PATCH] Make sure aspect ratio is preserved when size limits are hit,
 minor cleanup

svn path=/trunk/KDE/kdelibs/; revision=901264
---
 private/applethandle.cpp | 23 ++++++++++++++---------
 private/applethandle_p.h |  2 --
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/private/applethandle.cpp b/private/applethandle.cpp
index e9375e5a6..3bc1fbc11 100644
--- a/private/applethandle.cpp
+++ b/private/applethandle.cpp
@@ -469,7 +469,6 @@ void AppletHandle::mousePressEvent(QGraphicsSceneMouseEvent *event)
             }
             m_resizeGrabPoint = mapToScene(event->pos());                
             QPointF cursorRelativeToStatic = m_resizeGrabPoint - m_resizeStaticPoint;
-            m_aspectResizeOrigRadius = sqrt(pow(cursorRelativeToStatic.x(), 2) + pow(cursorRelativeToStatic.y(), 2));
 
             // rotate
             m_rotateAngleOffset = m_angle - _k_pointAngle(mapToScene(event->pos()) - m_origAppletCenter);
@@ -578,7 +577,7 @@ qreal _k_distanceForPoint(QPointF point)
 
 qreal _k_pointAngle(QPointF in)
 {
-    qreal r = sqrt(pow(in.x(), 2) + pow(in.y(), 2));
+    qreal r = sqrt(in.x()*in.x() + in.y()*in.y());
     qreal cosine = in.x()/r;
     qreal sine = in.y()/r;
 
@@ -591,7 +590,7 @@ qreal _k_pointAngle(QPointF in)
 
 QPointF _k_rotatePoint(QPointF in, qreal rotateAngle)
 {
-    qreal r = sqrt(pow(in.x(), 2) + pow(in.y(), 2));
+    qreal r = sqrt(in.x()*in.x() + in.y()*in.y());
     qreal cosine = in.x()/r;
     qreal sine = in.y()/r;
 
@@ -688,14 +687,20 @@ void AppletHandle::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
                 qreal sx = newSize.x();
                 qreal sy = newSize.y();
 
-                qreal x = ox*(sx*ox+sy*oy)/(pow(ox,2)+pow(oy,2));
-                qreal y = oy*x/ox;
+                qreal x = ox*(sx*ox+sy*oy)/(ox*ox+oy*oy);
+                qreal y = (oy/ox)*x;
                 newSize = QPointF(x, y);
-            }
 
-            // limit size
-            newSize.rx() = qMin(max.width(), qMax(min.width(), newSize.x()));
-            newSize.ry() = qMin(max.height(), qMax(min.height(), newSize.y()));
+                // limit size, preserve ratio
+                newSize.rx() = qMin(max.width(), qMax(min.width(), newSize.x()));
+                newSize.ry() = newSize.x()*(oy/ox);
+                newSize.ry() = qMin(max.height(), qMax(min.height(), newSize.y()));
+                newSize.rx() = newSize.y()/(oy/ox);
+            } else {
+                // limit size
+                newSize.rx() = qMin(max.width(), qMax(min.width(), newSize.x()));
+                newSize.ry() = qMin(max.height(), qMax(min.height(), newSize.y()));
+            }
 
             // move center such that the static corner remains in the same place
             if (m_buttonsOnRight) {
diff --git a/private/applethandle_p.h b/private/applethandle_p.h
index 40d143e68..34238505d 100644
--- a/private/applethandle_p.h
+++ b/private/applethandle_p.h
@@ -135,8 +135,6 @@ class AppletHandle : public QObject, public QGraphicsItem
         // used for resize
         QPointF m_resizeStaticPoint;
         QPointF m_resizeGrabPoint;
-        // used during aspect-ratio preserving resize
-        qreal m_aspectResizeOrigRadius;
         // used for rotate
         qreal m_rotateAngleOffset; // applet angle minus cursor angle