diff options
Diffstat (limited to 'src/gui/kernel')
-rw-r--r-- | src/gui/kernel/qplatformintegration.cpp | 6 | ||||
-rw-r--r-- | src/gui/kernel/qplatformintegration.h | 5 | ||||
-rw-r--r-- | src/gui/kernel/qplatformtheme.cpp | 12 | ||||
-rw-r--r-- | src/gui/kernel/qplatformtheme.h | 5 |
4 files changed, 26 insertions, 2 deletions
diff --git a/src/gui/kernel/qplatformintegration.cpp b/src/gui/kernel/qplatformintegration.cpp index 29dfba8155..aa4fe078a1 100644 --- a/src/gui/kernel/qplatformintegration.cpp +++ b/src/gui/kernel/qplatformintegration.cpp @@ -410,6 +410,12 @@ QVariant QPlatformIntegration::styleHint(StyleHint hint) const return QPlatformTheme::defaultThemeHint(QPlatformTheme::MouseQuickSelectionThreshold); case MouseDoubleClickDistance: return QPlatformTheme::defaultThemeHint(QPlatformTheme::MouseDoubleClickDistance); + case FlickStartDistance: + return QPlatformTheme::defaultThemeHint(QPlatformTheme::FlickStartDistance); + case FlickMaximumVelocity: + return QPlatformTheme::defaultThemeHint(QPlatformTheme::FlickMaximumVelocity); + case FlickDeceleration: + return QPlatformTheme::defaultThemeHint(QPlatformTheme::FlickDeceleration); } return 0; diff --git a/src/gui/kernel/qplatformintegration.h b/src/gui/kernel/qplatformintegration.h index cc617faca9..f718e1e45b 100644 --- a/src/gui/kernel/qplatformintegration.h +++ b/src/gui/kernel/qplatformintegration.h @@ -161,7 +161,10 @@ public: WheelScrollLines, ShowShortcutsInContextMenus, MouseQuickSelectionThreshold, - MouseDoubleClickDistance + MouseDoubleClickDistance, + FlickStartDistance, + FlickMaximumVelocity, + FlickDeceleration }; virtual QVariant styleHint(StyleHint hint) const; diff --git a/src/gui/kernel/qplatformtheme.cpp b/src/gui/kernel/qplatformtheme.cpp index 83022fbb69..fb1c27a15a 100644 --- a/src/gui/kernel/qplatformtheme.cpp +++ b/src/gui/kernel/qplatformtheme.cpp @@ -513,6 +513,12 @@ QVariant QPlatformTheme::themeHint(ThemeHint hint) const return QGuiApplicationPrivate::platformIntegration()->styleHint(QPlatformIntegration::ShowShortcutsInContextMenus); case QPlatformTheme::SetFocusOnTouchRelease: return QGuiApplicationPrivate::platformIntegration()->styleHint(QPlatformIntegration::SetFocusOnTouchRelease); + case QPlatformTheme::FlickStartDistance: + return QGuiApplicationPrivate::platformIntegration()->styleHint(QPlatformIntegration::FlickStartDistance); + case QPlatformTheme::FlickMaximumVelocity: + return QGuiApplicationPrivate::platformIntegration()->styleHint(QPlatformIntegration::FlickMaximumVelocity); + case QPlatformTheme::FlickDeceleration: + return QGuiApplicationPrivate::platformIntegration()->styleHint(QPlatformIntegration::FlickDeceleration); default: return QPlatformTheme::defaultThemeHint(hint); } @@ -613,6 +619,12 @@ QVariant QPlatformTheme::defaultThemeHint(ThemeHint hint) return QVariant::fromValue(QList<Qt::Key>({ Qt::Key_Space, Qt::Key_Select })); case SetFocusOnTouchRelease: return false; + case FlickStartDistance: + return QVariant(15); + case FlickMaximumVelocity: + return QVariant(2500); + case FlickDeceleration: + return QVariant(5000); } return QVariant(); } diff --git a/src/gui/kernel/qplatformtheme.h b/src/gui/kernel/qplatformtheme.h index 7462daa2a4..1fa8c12b48 100644 --- a/src/gui/kernel/qplatformtheme.h +++ b/src/gui/kernel/qplatformtheme.h @@ -88,7 +88,10 @@ public: ShowDirectoriesFirst, PreselectFirstFileInDirectory, ButtonPressKeys, - SetFocusOnTouchRelease + SetFocusOnTouchRelease, + FlickStartDistance, + FlickMaximumVelocity, + FlickDeceleration }; Q_ENUM(ThemeHint) |