support for touchEvents

svn path=/trunk/KDE/kdelibs/; revision=1049191
This commit is contained in:
Marco Martin 2009-11-14 17:33:00 +00:00
parent 52a50afc4d
commit 4988229770
2 changed files with 48 additions and 0 deletions

View File

@ -26,6 +26,7 @@
#include <QtGui/QPainter> #include <QtGui/QPainter>
#include <QtGui/QApplication> #include <QtGui/QApplication>
#include <QtGui/QMenu> #include <QtGui/QMenu>
#include <QTouchEvent>
#include <kcolorscheme.h> #include <kcolorscheme.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
@ -71,6 +72,7 @@ AppletHandle::AppletHandle(Containment *parent, Applet *applet, const QPointF &h
setFlags(flags() | QGraphicsItem::ItemStacksBehindParent); setFlags(flags() | QGraphicsItem::ItemStacksBehindParent);
KColorScheme colorScheme(QPalette::Active, KColorScheme::View, KColorScheme colorScheme(QPalette::Active, KColorScheme::View,
Theme::defaultTheme()->colorScheme()); Theme::defaultTheme()->colorScheme());
setAcceptTouchEvents(true);
m_gradientColor = colorScheme.background(KColorScheme::NormalBackground).color(); m_gradientColor = colorScheme.background(KColorScheme::NormalBackground).color();
m_originalGeom = m_applet->geometry(); m_originalGeom = m_applet->geometry();
m_originalTransform = m_applet->transform(); m_originalTransform = m_applet->transform();
@ -729,6 +731,51 @@ void AppletHandle::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
} }
} }
bool AppletHandle::sceneEvent(QEvent *event)
{
switch (event->type()) {
case QEvent::TouchBegin:
case QEvent::TouchUpdate:
case QEvent::TouchEnd:
{
QList<QTouchEvent::TouchPoint> touchPoints = static_cast<QTouchEvent *>(event)->touchPoints();
if (touchPoints.count() == 2) {
const QTouchEvent::TouchPoint &touchPoint0 = touchPoints.first();
const QTouchEvent::TouchPoint &touchPoint1 = touchPoints.last();
//rotation
QLineF line0(touchPoint0.lastScenePos(), touchPoint1.lastScenePos());
QLineF line1(touchPoint0.scenePos(), touchPoint1.scenePos());
//m_applet->setTransformOriginPoint(m_applet->boundingRect().center());
m_angle = m_applet->rotation()+line1.angleTo(line0);
//m_applet->setRotation(m_angle);
//m_applet->setTransformOriginPoint(QPointF(0,0));
QTransform t = m_applet->transform();
t.translate(m_applet->size().width()/2, m_applet->size().height()/2);
t.rotate(m_angle);
t.translate(-m_applet->size().width()/2, -m_applet->size().height()/2);
m_applet->setTransform(t);
//scaling
qreal scaleFactor = 1;
if (line0.length() > 0) {
scaleFactor = line1.length() / line0.length();
}
QRectF geom = m_applet->geometry();
geom.setWidth(geom.width()*scaleFactor);
geom.setHeight(geom.height()*scaleFactor);
geom.moveCenter(line1.pointAt(0.5));
m_applet->setGeometry(geom);
}
return true;
}
default:
break;
}
return QGraphicsItem::sceneEvent(event);
}
//pos relative to scene //pos relative to scene
void AppletHandle::switchContainment(Containment *containment, const QPointF &pos) void AppletHandle::switchContainment(Containment *containment, const QPointF &pos)
{ {

View File

@ -78,6 +78,7 @@ class AppletHandle : public QGraphicsObject
void hoverMoveEvent(QGraphicsSceneHoverEvent *event); void hoverMoveEvent(QGraphicsSceneHoverEvent *event);
void hoverLeaveEvent(QGraphicsSceneHoverEvent *event); void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
bool sceneEventFilter(QGraphicsItem *watched, QEvent *event); bool sceneEventFilter(QGraphicsItem *watched, QEvent *event);
bool sceneEvent(QEvent*);
Q_SIGNALS: Q_SIGNALS:
void disappearDone(AppletHandle *self); void disappearDone(AppletHandle *self);