alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

respect min and max sizes

Browse Source 
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=742405
This commit is contained in:
Aaron J. Seigo 2007-11-27 23:14:49 +00:00
parent 0b2c1b481f
commit 7fa8e8e1c0
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
applethandle.cpp
View File

@ -303,10 +303,26 @@ void AppletHandle::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
m_angle = m_angle - remainder(m_originalAngle+m_angle, snapAngle); m_angle = m_angle - remainder(m_originalAngle+m_angle, snapAngle);
} }
m_scale = _k_distanceForPoint(event->pos()-center) / _k_distanceForPoint(pressPos-center); qreal newScale = _k_distanceForPoint(event->pos()-center) / _k_distanceForPoint(pressPos-center);
if (qAbs(m_scale-1.0)<=0.1) { if (qAbs(newScale-1.0)<=0.1) {
m_scale = 1.0; newScale = 1.0;
}
qreal w = m_applet->size().width();
qreal h = m_applet->size().height();
QSizeF min = m_applet->minimumSize();
QSizeF max = m_applet->maximumSize();
//FIXME: this code will only work if we are keeping the aspect ratio, as we currently do
// as it resets only on the width, which will break if we allow resizing of width
// and height independantly
if (newScale * w < min.width() || newScale * h < min.height()) {
m_scale = min.width() / w;
} else if (newScale * w > max.width() && newScale * h > max.height()) {
m_scale = max.width() / w;
} else {
m_scale = newScale;
} }
QTransform matrix; QTransform matrix;