diff --git a/applethandle.cpp b/applethandle.cpp index 9cee09b00..dc8cec390 100644 --- a/applethandle.cpp +++ b/applethandle.cpp @@ -196,18 +196,14 @@ AppletHandle::ButtonType AppletHandle::mapToButton(const QPointF &point) const return RemoveButton; } - return m_applet->mapToParent(m_applet->shape()).contains(point) ? NoButton : MoveButton; + return MoveButton; + //return m_applet->mapToParent(m_applet->shape()).contains(point) ? NoButton : MoveButton; } void AppletHandle::mousePressEvent(QGraphicsSceneMouseEvent *event) { if (event->button() == Qt::LeftButton) { m_pressedButton = mapToButton(event->pos()); - - if (m_pressedButton == NoButton) { - // since drag is everywhere there isn't a button, NoButton clicks mean the applet - - } event->accept(); update(); return; diff --git a/svg.cpp b/svg.cpp index cfeb88ceb..0ec021d4f 100644 --- a/svg.cpp +++ b/svg.cpp @@ -182,7 +182,7 @@ class Svg::Private QSizeF naturalSize = renderer->defaultSize(); qreal dx = size.width() / naturalSize.width(); qreal dy = size.height() / naturalSize.height(); - + return QRect(elementRect.x() * dx, elementRect.y() * dy, elementRect.width() * dx, elementRect.height() * dy); }