diff options
author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-09-01 09:10:53 (GMT) |
---|---|---|
committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-09-03 09:30:54 (GMT) |
commit | a1a0ea71d8861e2b794f2f9b55447d50fc520de3 (patch) | |
tree | 4501c80ddb47c3dbe9526c16f8ede26716054a54 /src/gui/kernel/qwidget_win.cpp | |
parent | 0d5b6dccf5fa854632e61971364629b36e0d3857 (diff) | |
download | Qt-a1a0ea71d8861e2b794f2f9b55447d50fc520de3.zip Qt-a1a0ea71d8861e2b794f2f9b55447d50fc520de3.tar.gz Qt-a1a0ea71d8861e2b794f2f9b55447d50fc520de3.tar.bz2 |
Improved the gesture api.
Added a new widget attribute Qt::WA_DontUseStandardGestures that disables all
implicit gestures (i.e. gestures that are automatically enabled by Qt itself).
This change also changes the way gestures are handled on
QAbstractScrollArea-based widgets on Windows - the gestures are supposed to be
created on the viewport widget.
Reviewed-by: Bradley T. Hughes
Diffstat (limited to 'src/gui/kernel/qwidget_win.cpp')
-rw-r--r-- | src/gui/kernel/qwidget_win.cpp | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/src/gui/kernel/qwidget_win.cpp b/src/gui/kernel/qwidget_win.cpp index 8e60fb3..0ec7e7e 100644 --- a/src/gui/kernel/qwidget_win.cpp +++ b/src/gui/kernel/qwidget_win.cpp @@ -2062,29 +2062,21 @@ void QWidgetPrivate::registerTouchWindow() void QWidgetPrivate::winSetupGestures() { Q_Q(QWidget); - if (!q) - return; - if (!q->isVisible()) + if (!q || !q->isVisible()) return; QApplicationPrivate *qAppPriv = QApplicationPrivate::instance(); - bool needh = false; - bool needv = false; - bool singleFingerPanEnabled = false; QApplicationPrivate::WidgetStandardGesturesMap::const_iterator it = qAppPriv->widgetGestures.find(q); if (it == qAppPriv->widgetGestures.end()) return; const QStandardGestures &gestures = it.value(); - WId winid = 0; + WId winid = q->effectiveWinId(); - if (QAbstractScrollArea *asa = qobject_cast<QAbstractScrollArea*>(q)) { - winid = asa->viewport()->internalWinId(); - if (!winid) { - QWidget *nativeParent = asa->viewport()->nativeParentWidget(); - if (!nativeParent) - return; - winid = nativeParent->internalWinId(); - } + bool needh = false; + bool needv = false; + bool singleFingerPanEnabled = false; + + if (QAbstractScrollArea *asa = qobject_cast<QAbstractScrollArea*>(q->parent())) { QScrollBar *hbar = asa->horizontalScrollBar(); QScrollBar *vbar = asa->verticalScrollBar(); Qt::ScrollBarPolicy hbarpolicy = asa->horizontalScrollBarPolicy(); @@ -2094,12 +2086,6 @@ void QWidgetPrivate::winSetupGestures() needv = (vbarpolicy == Qt::ScrollBarAlwaysOn || (vbarpolicy == Qt::ScrollBarAsNeeded && vbar->minimum() < vbar->maximum())); singleFingerPanEnabled = asa->d_func()->singleFingerPanEnabled; - } else { - winid = q->internalWinId(); - if (!winid) { - if (QWidget *nativeParent = q->nativeParentWidget()) - winid = nativeParent->internalWinId(); - } } if (winid && qAppPriv->SetGestureConfig) { GESTURECONFIG gc[3]; |