From 8874fddefceaaa86ad85717273ee58a5e84fd883 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 20 Jul 2016 21:07:19 +0200 Subject: Universal: determine the default hoverEnabled value from QStyleHints Change-Id: I76857a7ea88db3d47415580a83fa4431b732a0f2 Task-number: QTBUG-50003 Reviewed-by: Mitch Curtis --- src/imports/controls/universal/Button.qml | 2 ++ src/imports/controls/universal/CheckBox.qml | 2 ++ src/imports/controls/universal/CheckDelegate.qml | 2 ++ src/imports/controls/universal/ComboBox.qml | 2 ++ src/imports/controls/universal/Dial.qml | 2 ++ src/imports/controls/universal/ItemDelegate.qml | 2 ++ src/imports/controls/universal/MenuItem.qml | 2 ++ src/imports/controls/universal/RadioButton.qml | 2 ++ src/imports/controls/universal/RadioDelegate.qml | 2 ++ src/imports/controls/universal/RangeSlider.qml | 2 ++ src/imports/controls/universal/ScrollBar.qml | 2 ++ src/imports/controls/universal/Slider.qml | 2 ++ src/imports/controls/universal/SpinBox.qml | 2 ++ src/imports/controls/universal/SwipeDelegate.qml | 2 ++ src/imports/controls/universal/Switch.qml | 2 ++ src/imports/controls/universal/SwitchDelegate.qml | 2 ++ src/imports/controls/universal/TabButton.qml | 2 ++ src/imports/controls/universal/TextArea.qml | 2 ++ src/imports/controls/universal/TextField.qml | 2 ++ src/imports/controls/universal/ToolButton.qml | 2 ++ 20 files changed, 40 insertions(+) diff --git a/src/imports/controls/universal/Button.qml b/src/imports/controls/universal/Button.qml index e53e6152..f784c670 100644 --- a/src/imports/controls/universal/Button.qml +++ b/src/imports/controls/universal/Button.qml @@ -47,6 +47,8 @@ T.Button { contentItem.implicitHeight + topPadding + bottomPadding) baselineOffset: contentItem.y + contentItem.baselineOffset + hoverEnabled: Qt.styleHints.useHoverEffects + padding: 8 topPadding: padding - 4 bottomPadding: padding - 4 diff --git a/src/imports/controls/universal/CheckBox.qml b/src/imports/controls/universal/CheckBox.qml index 51d6d874..d856f3ea 100644 --- a/src/imports/controls/universal/CheckBox.qml +++ b/src/imports/controls/universal/CheckBox.qml @@ -49,6 +49,8 @@ T.CheckBox { indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) baselineOffset: contentItem.y + contentItem.baselineOffset + hoverEnabled: Qt.styleHints.useHoverEffects + padding: 6 spacing: 8 diff --git a/src/imports/controls/universal/CheckDelegate.qml b/src/imports/controls/universal/CheckDelegate.qml index 464c55be..cd7245fa 100644 --- a/src/imports/controls/universal/CheckDelegate.qml +++ b/src/imports/controls/universal/CheckDelegate.qml @@ -48,6 +48,8 @@ T.CheckDelegate { indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) baselineOffset: contentItem.y + contentItem.baselineOffset + hoverEnabled: Qt.styleHints.useHoverEffects + spacing: 12 padding: 12 diff --git a/src/imports/controls/universal/ComboBox.qml b/src/imports/controls/universal/ComboBox.qml index 86cc92ca..467ed6ef 100644 --- a/src/imports/controls/universal/ComboBox.qml +++ b/src/imports/controls/universal/ComboBox.qml @@ -50,6 +50,8 @@ T.ComboBox { indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) baselineOffset: contentItem.y + contentItem.baselineOffset + hoverEnabled: Qt.styleHints.useHoverEffects + spacing: 10 padding: 12 topPadding: padding - 7 diff --git a/src/imports/controls/universal/Dial.qml b/src/imports/controls/universal/Dial.qml index fe4c4c71..64dca3da 100644 --- a/src/imports/controls/universal/Dial.qml +++ b/src/imports/controls/universal/Dial.qml @@ -44,6 +44,8 @@ T.Dial { implicitWidth: 100 implicitHeight: 100 + hoverEnabled: Qt.styleHints.useHoverEffects + background: Rectangle { x: control.width / 2 - width / 2 y: control.height / 2 - height / 2 diff --git a/src/imports/controls/universal/ItemDelegate.qml b/src/imports/controls/universal/ItemDelegate.qml index d7e00bfd..e0189082 100644 --- a/src/imports/controls/universal/ItemDelegate.qml +++ b/src/imports/controls/universal/ItemDelegate.qml @@ -48,6 +48,8 @@ T.ItemDelegate { indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) baselineOffset: contentItem.y + contentItem.baselineOffset + hoverEnabled: Qt.styleHints.useHoverEffects + spacing: 12 padding: 12 diff --git a/src/imports/controls/universal/MenuItem.qml b/src/imports/controls/universal/MenuItem.qml index 19f7b96a..a1c51eed 100644 --- a/src/imports/controls/universal/MenuItem.qml +++ b/src/imports/controls/universal/MenuItem.qml @@ -48,6 +48,8 @@ T.MenuItem { indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) baselineOffset: contentItem.y + contentItem.baselineOffset + hoverEnabled: Qt.styleHints.useHoverEffects + padding: 12 topPadding: padding - 1 bottomPadding: padding + 1 diff --git a/src/imports/controls/universal/RadioButton.qml b/src/imports/controls/universal/RadioButton.qml index e13e6a19..7331879e 100644 --- a/src/imports/controls/universal/RadioButton.qml +++ b/src/imports/controls/universal/RadioButton.qml @@ -49,6 +49,8 @@ T.RadioButton { indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) baselineOffset: contentItem.y + contentItem.baselineOffset + hoverEnabled: Qt.styleHints.useHoverEffects + padding: 6 spacing: 8 diff --git a/src/imports/controls/universal/RadioDelegate.qml b/src/imports/controls/universal/RadioDelegate.qml index e4716174..15ca2180 100644 --- a/src/imports/controls/universal/RadioDelegate.qml +++ b/src/imports/controls/universal/RadioDelegate.qml @@ -48,6 +48,8 @@ T.RadioDelegate { indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) baselineOffset: contentItem.y + contentItem.baselineOffset + hoverEnabled: Qt.styleHints.useHoverEffects + spacing: 12 padding: 12 diff --git a/src/imports/controls/universal/RangeSlider.qml b/src/imports/controls/universal/RangeSlider.qml index 6b1ee996..d66e26a7 100644 --- a/src/imports/controls/universal/RangeSlider.qml +++ b/src/imports/controls/universal/RangeSlider.qml @@ -48,6 +48,8 @@ T.RangeSlider { Math.max(first.handle ? first.handle.implicitHeight : 0, second.handle ? second.handle.implicitHeight : 0) + topPadding + bottomPadding) + hoverEnabled: Qt.styleHints.useHoverEffects + padding: 6 first.handle: Rectangle { diff --git a/src/imports/controls/universal/ScrollBar.qml b/src/imports/controls/universal/ScrollBar.qml index 4e7ac1e1..4e654132 100644 --- a/src/imports/controls/universal/ScrollBar.qml +++ b/src/imports/controls/universal/ScrollBar.qml @@ -46,6 +46,8 @@ T.ScrollBar { implicitHeight: Math.max(background ? background.implicitHeight : 0, contentItem.implicitHeight + topPadding + bottomPadding) + hoverEnabled: Qt.styleHints.useHoverEffects + // TODO: arrows contentItem: Rectangle { diff --git a/src/imports/controls/universal/Slider.qml b/src/imports/controls/universal/Slider.qml index a71220a6..3ae6a578 100644 --- a/src/imports/controls/universal/Slider.qml +++ b/src/imports/controls/universal/Slider.qml @@ -46,6 +46,8 @@ T.Slider { implicitHeight: Math.max(background ? background.implicitHeight : 0, (handle ? handle.implicitHeight : 0) + topPadding + bottomPadding) + hoverEnabled: Qt.styleHints.useHoverEffects + padding: 6 property bool useSystemFocusVisuals: true diff --git a/src/imports/controls/universal/SpinBox.qml b/src/imports/controls/universal/SpinBox.qml index 918dab8a..0e7143f6 100644 --- a/src/imports/controls/universal/SpinBox.qml +++ b/src/imports/controls/universal/SpinBox.qml @@ -51,6 +51,8 @@ T.SpinBox { down.indicator ? down.indicator.implicitHeight : 0) baselineOffset: contentItem.y + contentItem.baselineOffset + hoverEnabled: Qt.styleHints.useHoverEffects + // TextControlThemePadding + 2 (border) padding: 12 topPadding: padding - 7 diff --git a/src/imports/controls/universal/SwipeDelegate.qml b/src/imports/controls/universal/SwipeDelegate.qml index c81d1f90..77df02cf 100644 --- a/src/imports/controls/universal/SwipeDelegate.qml +++ b/src/imports/controls/universal/SwipeDelegate.qml @@ -48,6 +48,8 @@ T.SwipeDelegate { indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) baselineOffset: contentItem.y + contentItem.baselineOffset + hoverEnabled: Qt.styleHints.useHoverEffects + spacing: 12 padding: 12 diff --git a/src/imports/controls/universal/Switch.qml b/src/imports/controls/universal/Switch.qml index 5d340c9f..44aa190d 100644 --- a/src/imports/controls/universal/Switch.qml +++ b/src/imports/controls/universal/Switch.qml @@ -48,6 +48,8 @@ T.Switch { indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) baselineOffset: contentItem.y + contentItem.baselineOffset + hoverEnabled: Qt.styleHints.useHoverEffects + padding: 5 spacing: 8 diff --git a/src/imports/controls/universal/SwitchDelegate.qml b/src/imports/controls/universal/SwitchDelegate.qml index d769185a..9c715d06 100644 --- a/src/imports/controls/universal/SwitchDelegate.qml +++ b/src/imports/controls/universal/SwitchDelegate.qml @@ -48,6 +48,8 @@ T.SwitchDelegate { indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) baselineOffset: contentItem.y + contentItem.baselineOffset + hoverEnabled: Qt.styleHints.useHoverEffects + spacing: 12 padding: 12 diff --git a/src/imports/controls/universal/TabButton.qml b/src/imports/controls/universal/TabButton.qml index ab76575e..e9971298 100644 --- a/src/imports/controls/universal/TabButton.qml +++ b/src/imports/controls/universal/TabButton.qml @@ -47,6 +47,8 @@ T.TabButton { contentItem.implicitHeight + topPadding + bottomPadding) baselineOffset: contentItem.y + contentItem.baselineOffset + hoverEnabled: Qt.styleHints.useHoverEffects + padding: 12 // PivotItemMargin contentItem: Text { diff --git a/src/imports/controls/universal/TextArea.qml b/src/imports/controls/universal/TextArea.qml index 811e5fb9..96d3cc13 100644 --- a/src/imports/controls/universal/TextArea.qml +++ b/src/imports/controls/universal/TextArea.qml @@ -48,6 +48,8 @@ T.TextArea { background ? background.implicitHeight : 0, placeholder.implicitHeight + topPadding + bottomPadding) + hoverEnabled: Qt.styleHints.useHoverEffects + // TextControlThemePadding + 2 (border) padding: 12 topPadding: padding - 7 diff --git a/src/imports/controls/universal/TextField.qml b/src/imports/controls/universal/TextField.qml index 337eee86..ba24a155 100644 --- a/src/imports/controls/universal/TextField.qml +++ b/src/imports/controls/universal/TextField.qml @@ -48,6 +48,8 @@ T.TextField { background ? background.implicitHeight : 0, placeholder.implicitHeight + topPadding + bottomPadding) + hoverEnabled: Qt.styleHints.useHoverEffects + // TextControlThemePadding + 2 (border) padding: 12 topPadding: padding - 7 diff --git a/src/imports/controls/universal/ToolButton.qml b/src/imports/controls/universal/ToolButton.qml index 7ee15e89..45bf96ec 100644 --- a/src/imports/controls/universal/ToolButton.qml +++ b/src/imports/controls/universal/ToolButton.qml @@ -47,6 +47,8 @@ T.ToolButton { contentItem.implicitHeight + topPadding + bottomPadding) baselineOffset: contentItem.y + contentItem.baselineOffset + hoverEnabled: Qt.styleHints.useHoverEffects + padding: 6 property bool useSystemFocusVisuals: true -- cgit v1.2.3