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

Last handle rotation fix (hopefully).

Browse Source 
Now the handles are drawn where you'd expect on a rotated applet, and rotating an already rotated applet starts where it was when you clicked on the rotate button, rather than jumping back to "not rotated" and moving from there.


svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=758496
This commit is contained in:
Alex Merry 2008-01-08 01:22:44 +00:00
parent 553bbefd19
commit d01c48e722
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
applethandle.cpp
View File

@ -53,6 +53,7 @@ AppletHandle::AppletHandle(Containment *parent, Applet *applet)
m_anim(FadeIn), m_anim(FadeIn),
m_animId(0), m_animId(0),
m_angle(0.0), m_angle(0.0),
m_tempAngle(0.0),
m_scaleWidth(1.0), m_scaleWidth(1.0),
m_scaleHeight(1.0) m_scaleHeight(1.0)
{ {
@ -67,12 +68,23 @@ AppletHandle::AppletHandle(Containment *parent, Applet *applet)
qreal cosine = originalMatrix.m11(); qreal cosine = originalMatrix.m11();
qreal sine = originalMatrix.m12(); qreal sine = originalMatrix.m12();
m_originalAngle = _k_angleForPoints(QPointF(0, 0), m_angle = _k_angleForPoints(QPointF(0, 0),
QPointF(1, 0), QPointF(1, 0),
QPointF(cosine, sine)); QPointF(cosine, sine));
m_applet->resetTransform();
calculateSize(); calculateSize();
m_applet->setParentItem(this); m_applet->setParentItem(this);
rect = QRectF(m_applet->pos(), m_applet->size());
center = rect.center();
QTransform matrix;
matrix.translate(center.x(), center.y());
matrix.rotateRadians(m_angle);
matrix.translate(-center.x(), -center.y());
setTransform(matrix);
connect(m_applet, SIGNAL(destroyed(QObject*)), this, SLOT(appletDestroyed())); connect(m_applet, SIGNAL(destroyed(QObject*)), this, SLOT(appletDestroyed()));
setAcceptsHoverEvents(true); setAcceptsHoverEvents(true);
startFading(FadeIn); startFading(FadeIn);
@ -89,7 +101,7 @@ AppletHandle::~AppletHandle()
QTransform matrix; QTransform matrix;
matrix.translate(center.x(), center.y()); matrix.translate(center.x(), center.y());
matrix.rotateRadians(m_originalAngle+m_angle); matrix.rotateRadians(m_angle);
matrix.translate(-center.x(), -center.y()); matrix.translate(-center.x(), -center.y());
m_applet->setTransform(matrix); m_applet->setTransform(matrix);
@ -244,9 +256,12 @@ void AppletHandle::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
QRectF rect = QRectF(m_applet->pos(), m_applet->size()); QRectF rect = QRectF(m_applet->pos(), m_applet->size());
QPointF center = rect.center(); QPointF center = rect.center();
m_angle += m_tempAngle;
m_tempAngle = 0;
QTransform matrix; QTransform matrix;
matrix.translate(center.x(), center.y()); matrix.translate(center.x(), center.y());
matrix.rotateRadians(m_originalAngle+m_angle); matrix.rotateRadians(m_angle);
matrix.translate(-center.x(), -center.y()); matrix.translate(-center.x(), -center.y());
setTransform(matrix); setTransform(matrix);
@ -344,10 +359,10 @@ void AppletHandle::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
QPointF center = rect.center(); QPointF center = rect.center();
if (m_pressedButton == RotateButton) { if (m_pressedButton == RotateButton) {
m_angle = _k_angleForPoints(center, pressPos, event->pos()); m_tempAngle = _k_angleForPoints(center, pressPos, event->pos());
if (fabs(remainder(m_originalAngle+m_angle, snapAngle)) < 0.15) { if (fabs(remainder(m_angle+m_tempAngle, snapAngle)) < 0.15) {
m_angle = m_angle - remainder(m_originalAngle+m_angle, snapAngle); m_tempAngle = m_tempAngle - remainder(m_angle+m_tempAngle, snapAngle);
} }
m_scaleWidth = m_scaleHeight = 1.0; m_scaleWidth = m_scaleHeight = 1.0;
@ -416,7 +431,7 @@ void AppletHandle::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
QTransform matrix; QTransform matrix;
matrix.translate(center.x(), center.y()); matrix.translate(center.x(), center.y());
matrix.rotateRadians(m_angle); matrix.rotateRadians(m_angle+m_tempAngle);
matrix.scale(m_scaleWidth, m_scaleHeight); matrix.scale(m_scaleWidth, m_scaleHeight);
matrix.translate(-center.x(), -center.y()); matrix.translate(-center.x(), -center.y());
setTransform(matrix); setTransform(matrix);

2
applethandle_p.h
View File

@ -81,9 +81,9 @@ class AppletHandle : public QObject, public QGraphicsItem
FadeType m_anim; FadeType m_anim;
Phase::AnimId m_animId; Phase::AnimId m_animId;
qreal m_angle; qreal m_angle;
qreal m_tempAngle;
qreal m_scaleWidth; qreal m_scaleWidth;
qreal m_scaleHeight; qreal m_scaleHeight;
qreal m_originalAngle;
QColor m_gradientColor; QColor m_gradientColor;
}; };