From 651dee293bf1cf3de848eed496c3f6433712d8d5 Mon Sep 17 00:00:00 2001 From: zccrs Date: Wed, 2 Jan 2019 16:34:38 +0800 Subject: [PATCH] fix: can not scroll view on DSettingDialog by touchscreen Change-Id: I0a14ea2571feeb16a40be061d7bb60e289b1cf57 --- src/widgets/private/settings/content.cpp | 13 +++++++++++++ src/widgets/private/settings/content.h | 2 ++ 2 files changed, 15 insertions(+) diff --git a/src/widgets/private/settings/content.cpp b/src/widgets/private/settings/content.cpp index 92912b902..ec9d60a49 100644 --- a/src/widgets/private/settings/content.cpp +++ b/src/widgets/private/settings/content.cpp @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -227,4 +228,16 @@ void Content::updateSettings(const QByteArray &translateContext, QPointersource() == Qt::MouseEventSynthesizedByQt) { + event->accept(); + + return; + } +} + DWIDGET_END_NAMESPACE diff --git a/src/widgets/private/settings/content.h b/src/widgets/private/settings/content.h index 554ba7f22..cd588372a 100644 --- a/src/widgets/private/settings/content.h +++ b/src/widgets/private/settings/content.h @@ -47,6 +47,8 @@ public Q_SLOTS: void updateSettings(const QByteArray &translateContext, QPointer settings); private: + void mouseMoveEvent(QMouseEvent *event) override; + QScopedPointer d_ptr; Q_DECLARE_PRIVATE_D(qGetPtrHelper(d_ptr), Content) };