bring back ctrl-overrides-aspect-ratio-mode

svn path=/trunk/KDE/kdelibs/; revision=905774
This commit is contained in:
Aaron J. Seigo 2009-01-05 01:08:40 +00:00
parent a2fe3d80af
commit a2ea13a973

View File

@ -681,7 +681,10 @@ void AppletHandle::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
// if preserving aspect ratio, project the calculated size point to the line
// theough the origin and the original size point
if (m_applet->aspectRatioMode() != Plasma::IgnoreAspectRatio) {
if ((m_applet->aspectRatioMode() != Plasma::IgnoreAspectRatio &&
!(event->modifiers() & Qt::ControlModifier)) ||
(m_applet->aspectRatioMode() == Plasma::IgnoreAspectRatio &&
(event->modifiers() & Qt::ControlModifier))) {
qreal ox = m_origAppletSize.x();
qreal oy = m_origAppletSize.y();
qreal sx = newSize.x();