diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-10-01 11:36:20 +0200 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@qt.io> | 2020-10-01 18:35:50 +0200 |
commit | 3c2eab829df900a4bcc308fe0d8d5a87cd8f56a3 (patch) | |
tree | acad42e24dde857eab91c4a9ef07239dd874abd9 | |
parent | 811c61937db166f57ecccb109faa86518b4881a2 (diff) |
Add setAcceptTouchEvents() in more controls that handle touch events
Task-number: QTBUG-87018
Change-Id: I5f9318bd1cad0f760caf02b9066e729af3601098
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
-rw-r--r-- | src/quicktemplates2/qquickdial.cpp | 3 | ||||
-rw-r--r-- | src/quicktemplates2/qquickoverlay.cpp | 3 | ||||
-rw-r--r-- | src/quicktemplates2/qquickpageindicator.cpp | 6 | ||||
-rw-r--r-- | src/quicktemplates2/qquickpopupitem.cpp | 3 | ||||
-rw-r--r-- | src/quicktemplates2/qquickrangeslider.cpp | 3 | ||||
-rw-r--r-- | src/quicktemplates2/qquickscrollbar.cpp | 9 | ||||
-rw-r--r-- | src/quicktemplates2/qquickslider.cpp | 3 |
7 files changed, 30 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickdial.cpp b/src/quicktemplates2/qquickdial.cpp index e011891f..6b137a78 100644 --- a/src/quicktemplates2/qquickdial.cpp +++ b/src/quicktemplates2/qquickdial.cpp @@ -313,6 +313,9 @@ QQuickDial::QQuickDial(QQuickItem *parent) { setActiveFocusOnTab(true); setAcceptedMouseButtons(Qt::LeftButton); +#if QT_CONFIG(quicktemplates2_multitouch) + setAcceptTouchEvents(true); +#endif #if QT_CONFIG(cursor) setCursor(Qt::ArrowCursor); #endif diff --git a/src/quicktemplates2/qquickoverlay.cpp b/src/quicktemplates2/qquickoverlay.cpp index 4d272bff..58a8368f 100644 --- a/src/quicktemplates2/qquickoverlay.cpp +++ b/src/quicktemplates2/qquickoverlay.cpp @@ -311,6 +311,9 @@ QQuickOverlay::QQuickOverlay(QQuickItem *parent) Q_D(QQuickOverlay); setZ(1000001); // DefaultWindowDecoration+1 setAcceptedMouseButtons(Qt::AllButtons); +#if QT_CONFIG(quicktemplates2_multitouch) + setAcceptTouchEvents(true); +#endif setFiltersChildMouseEvents(true); setVisible(false); diff --git a/src/quicktemplates2/qquickpageindicator.cpp b/src/quicktemplates2/qquickpageindicator.cpp index a06884cb..4a2b7f14 100644 --- a/src/quicktemplates2/qquickpageindicator.cpp +++ b/src/quicktemplates2/qquickpageindicator.cpp @@ -276,11 +276,17 @@ void QQuickPageIndicator::setInteractive(bool interactive) d->interactive = interactive; if (interactive) { setAcceptedMouseButtons(Qt::LeftButton); +#if QT_CONFIG(quicktemplates2_multitouch) + setAcceptTouchEvents(true); +#endif #if QT_CONFIG(cursor) setCursor(Qt::ArrowCursor); #endif } else { setAcceptedMouseButtons(Qt::NoButton); +#if QT_CONFIG(quicktemplates2_multitouch) + setAcceptTouchEvents(true); +#endif #if QT_CONFIG(cursor) unsetCursor(); #endif diff --git a/src/quicktemplates2/qquickpopupitem.cpp b/src/quicktemplates2/qquickpopupitem.cpp index 9390f665..a142b454 100644 --- a/src/quicktemplates2/qquickpopupitem.cpp +++ b/src/quicktemplates2/qquickpopupitem.cpp @@ -130,6 +130,9 @@ QQuickPopupItem::QQuickPopupItem(QQuickPopup *popup) setParent(popup); setFlag(ItemIsFocusScope); setAcceptedMouseButtons(Qt::AllButtons); +#if QT_CONFIG(quicktemplates2_multitouch) + setAcceptTouchEvents(true); +#endif #if QT_CONFIG(cursor) setCursor(Qt::ArrowCursor); #endif diff --git a/src/quicktemplates2/qquickrangeslider.cpp b/src/quicktemplates2/qquickrangeslider.cpp index af95d463..718dc752 100644 --- a/src/quicktemplates2/qquickrangeslider.cpp +++ b/src/quicktemplates2/qquickrangeslider.cpp @@ -625,6 +625,9 @@ QQuickRangeSlider::QQuickRangeSlider(QQuickItem *parent) setFlag(QQuickItem::ItemIsFocusScope); setAcceptedMouseButtons(Qt::LeftButton); +#if QT_CONFIG(quicktemplates2_multitouch) + setAcceptTouchEvents(true); +#endif #if QT_CONFIG(cursor) setCursor(Qt::ArrowCursor); #endif diff --git a/src/quicktemplates2/qquickscrollbar.cpp b/src/quicktemplates2/qquickscrollbar.cpp index b352224c..b88f396c 100644 --- a/src/quicktemplates2/qquickscrollbar.cpp +++ b/src/quicktemplates2/qquickscrollbar.cpp @@ -205,11 +205,17 @@ void QQuickScrollBarPrivate::setInteractive(bool enabled) interactive = enabled; if (interactive) { q->setAcceptedMouseButtons(Qt::LeftButton); +#if QT_CONFIG(quicktemplates2_multitouch) + q->setAcceptTouchEvents(true); +#endif #if QT_CONFIG(cursor) q->setCursor(Qt::ArrowCursor); #endif } else { q->setAcceptedMouseButtons(Qt::NoButton); +#if QT_CONFIG(quicktemplates2_multitouch) + q->setAcceptTouchEvents(false); +#endif #if QT_CONFIG(cursor) q->unsetCursor(); #endif @@ -303,6 +309,9 @@ QQuickScrollBar::QQuickScrollBar(QQuickItem *parent) { setKeepMouseGrab(true); setAcceptedMouseButtons(Qt::LeftButton); +#if QT_CONFIG(quicktemplates2_multitouch) + setAcceptTouchEvents(true); +#endif #if QT_CONFIG(cursor) setCursor(Qt::ArrowCursor); #endif diff --git a/src/quicktemplates2/qquickslider.cpp b/src/quicktemplates2/qquickslider.cpp index dcff5420..ad16303b 100644 --- a/src/quicktemplates2/qquickslider.cpp +++ b/src/quicktemplates2/qquickslider.cpp @@ -274,6 +274,9 @@ QQuickSlider::QQuickSlider(QQuickItem *parent) setActiveFocusOnTab(true); setFocusPolicy(Qt::StrongFocus); setAcceptedMouseButtons(Qt::LeftButton); +#if QT_CONFIG(quicktemplates2_multitouch) + setAcceptTouchEvents(true); +#endif #if QT_CONFIG(cursor) setCursor(Qt::ArrowCursor); #endif |