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

don't mix scene coordinates and parent ones

Browse Source 
so don't move widgets in totally absurd places

svn path=/trunk/KDE/kdelibs/; revision=1063024
This commit is contained in:
Marco Martin 2009-12-16 18:51:08 +00:00
parent 939449050f
commit 2afa60e695
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
private/applethandle.cpp
View File

@ -74,9 +74,9 @@ AppletHandle::AppletHandle(Containment *parent, Applet *applet, const QPointF &h
setFlags(flags() | QGraphicsItem::ItemStacksBehindParent);
KColorScheme colorScheme(QPalette::Active, KColorScheme::View,
Theme::defaultTheme()->colorScheme());
setAcceptTouchEvents(true);
setAcceptTouchEvents(true);
m_gradientColor = colorScheme.background(KColorScheme::NormalBackground).color();
m_originalGeom = m_applet->geometry();
m_originalGeom = mapToScene(QRectF(QPoint(0,0), m_applet->size())).boundingRect();
m_originalTransform = m_applet->transform();
QPointF center = QRectF(QPointF(), m_applet->size()).center();
@ -443,7 +443,7 @@ void AppletHandle::mousePressEvent(QGraphicsSceneMouseEvent *event)
}
if (m_pressedButton == ResizeButton || m_pressedButton == RotateButton) {
m_originalGeom = m_applet->geometry();
m_originalGeom = mapToScene(QRectF(QPoint(0,0), m_applet->size())).boundingRect();
m_origAppletCenter = m_originalGeom.center();
m_origAppletSize = QPointF(m_applet->size().width(), m_applet->size().height());
@ -704,8 +704,11 @@ void AppletHandle::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
// apply size
m_applet->resize(newSize.x(), newSize.y());
// apply position
m_applet->setPos(newCenter - newSize/2);
// apply position, no need if we're rotating
if (m_pressedButton != RotateButton) {
m_applet->setPos(m_containment->mapFromScene(newCenter - newSize/2));
}
// apply angle
QTransform at;
at.translate(newSize.x()/2, newSize.y()/2);