diff --git a/src/quickcontrols2/imagine/BusyIndicator.qml b/src/quickcontrols2/imagine/BusyIndicator.qml index b8ff0517b9..6dc40dc4be 100644 --- a/src/quickcontrols2/imagine/BusyIndicator.qml +++ b/src/quickcontrols2/imagine/BusyIndicator.qml @@ -36,7 +36,7 @@ T.BusyIndicator { {"disabled": !control.enabled}, {"running": control.running}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } } @@ -48,7 +48,7 @@ T.BusyIndicator { {"disabled": !control.enabled}, {"running": control.running}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } } diff --git a/src/quickcontrols2/imagine/Button.qml b/src/quickcontrols2/imagine/Button.qml index 125a585085..6526909587 100644 --- a/src/quickcontrols2/imagine/Button.qml +++ b/src/quickcontrols2/imagine/Button.qml @@ -58,7 +58,7 @@ T.Button { {"highlighted": control.highlighted}, {"mirrored": control.mirrored}, {"flat": control.flat}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } } diff --git a/src/quickcontrols2/imagine/CheckBox.qml b/src/quickcontrols2/imagine/CheckBox.qml index 0b6424a41b..11a2048e6f 100644 --- a/src/quickcontrols2/imagine/CheckBox.qml +++ b/src/quickcontrols2/imagine/CheckBox.qml @@ -40,7 +40,7 @@ T.CheckBox { {"partially-checked": control.checkState === Qt.PartiallyChecked}, {"focused": control.visualFocus}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } } @@ -66,7 +66,7 @@ T.CheckBox { {"partially-checked": control.checkState === Qt.PartiallyChecked}, {"focused": control.visualFocus}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } } diff --git a/src/quickcontrols2/imagine/CheckDelegate.qml b/src/quickcontrols2/imagine/CheckDelegate.qml index 2ed7531fb8..ccae3c1b9f 100644 --- a/src/quickcontrols2/imagine/CheckDelegate.qml +++ b/src/quickcontrols2/imagine/CheckDelegate.qml @@ -46,7 +46,7 @@ T.CheckDelegate { {"focused": control.visualFocus}, {"highlighted": control.highlighted}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } } @@ -77,7 +77,7 @@ T.CheckDelegate { {"focused": control.visualFocus}, {"highlighted": control.highlighted}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } } diff --git a/src/quickcontrols2/imagine/ComboBox.qml b/src/quickcontrols2/imagine/ComboBox.qml index a8addfa778..960d58334a 100644 --- a/src/quickcontrols2/imagine/ComboBox.qml +++ b/src/quickcontrols2/imagine/ComboBox.qml @@ -45,7 +45,7 @@ T.ComboBox { {"open": control.down}, {"focused": control.visualFocus}, {"mirrored": control.mirrored}, - {"hovered": control.hovered}, + {"hovered": control.enabled && control.hovered}, {"flat": control.flat} ] } @@ -82,7 +82,7 @@ T.ComboBox { {"open": control.down}, {"focused": control.visualFocus || (control.editable && control.activeFocus)}, {"mirrored": control.mirrored}, - {"hovered": control.hovered}, + {"hovered": control.enabled && control.hovered}, {"flat": control.flat} ] } @@ -130,7 +130,7 @@ T.ComboBox { {"editable": control.editable}, {"focused": control.visualFocus || (control.editable && control.activeFocus)}, {"mirrored": control.mirrored}, - {"hovered": control.hovered}, + {"hovered": control.enabled && control.hovered}, {"flat": control.flat} ] } diff --git a/src/quickcontrols2/imagine/DelayButton.qml b/src/quickcontrols2/imagine/DelayButton.qml index ef52ff694f..73854cdd33 100644 --- a/src/quickcontrols2/imagine/DelayButton.qml +++ b/src/quickcontrols2/imagine/DelayButton.qml @@ -48,7 +48,7 @@ T.DelayButton { {"checked": control.checked}, {"focused": control.visualFocus}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } @@ -66,7 +66,7 @@ T.DelayButton { {"checked": control.checked}, {"focused": control.visualFocus}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } } @@ -84,7 +84,7 @@ T.DelayButton { {"checked": control.checked}, {"focused": control.visualFocus}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } } diff --git a/src/quickcontrols2/imagine/Dial.qml b/src/quickcontrols2/imagine/Dial.qml index 8ee2b42420..85eb0a8422 100644 --- a/src/quickcontrols2/imagine/Dial.qml +++ b/src/quickcontrols2/imagine/Dial.qml @@ -35,7 +35,7 @@ T.Dial { {"pressed": control.pressed}, {"focused": control.visualFocus}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } @@ -60,7 +60,7 @@ T.Dial { {"pressed": control.pressed}, {"focused": control.visualFocus}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } } diff --git a/src/quickcontrols2/imagine/ItemDelegate.qml b/src/quickcontrols2/imagine/ItemDelegate.qml index 0471cbf856..2a2b0bd796 100644 --- a/src/quickcontrols2/imagine/ItemDelegate.qml +++ b/src/quickcontrols2/imagine/ItemDelegate.qml @@ -53,7 +53,7 @@ T.ItemDelegate { {"focused": control.visualFocus}, {"highlighted": control.highlighted}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } } diff --git a/src/quickcontrols2/imagine/Label.qml b/src/quickcontrols2/imagine/Label.qml index 000a63e4ec..9a612bcd35 100644 --- a/src/quickcontrols2/imagine/Label.qml +++ b/src/quickcontrols2/imagine/Label.qml @@ -23,7 +23,7 @@ T.Label { states: [ {"disabled": !control.enabled}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } } diff --git a/src/quickcontrols2/imagine/MenuItem.qml b/src/quickcontrols2/imagine/MenuItem.qml index 3696085ec2..5d8809d61a 100644 --- a/src/quickcontrols2/imagine/MenuItem.qml +++ b/src/quickcontrols2/imagine/MenuItem.qml @@ -63,7 +63,7 @@ T.MenuItem { {"focused": control.visualFocus}, {"highlighted": control.highlighted}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } } @@ -82,7 +82,7 @@ T.MenuItem { {"focused": control.visualFocus}, {"highlighted": control.highlighted}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } } @@ -97,7 +97,7 @@ T.MenuItem { {"focused": control.visualFocus}, {"highlighted": control.highlighted}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } } diff --git a/src/quickcontrols2/imagine/PageIndicator.qml b/src/quickcontrols2/imagine/PageIndicator.qml index 2d7ceb0e3b..42afbda70a 100644 --- a/src/quickcontrols2/imagine/PageIndicator.qml +++ b/src/quickcontrols2/imagine/PageIndicator.qml @@ -32,7 +32,7 @@ T.PageIndicator { {"pressed": pressed}, {"current": index === control.currentIndex}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} // ### TODO: context property + {"hovered": control.enabled && control.hovered} // ### TODO: context property ] } } @@ -52,7 +52,7 @@ T.PageIndicator { states: [ {"disabled": !control.enabled}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } } diff --git a/src/quickcontrols2/imagine/ProgressBar.qml b/src/quickcontrols2/imagine/ProgressBar.qml index d81e88ad96..641320fab3 100644 --- a/src/quickcontrols2/imagine/ProgressBar.qml +++ b/src/quickcontrols2/imagine/ProgressBar.qml @@ -43,7 +43,7 @@ T.ProgressBar { {"disabled": !control.enabled}, {"indeterminate": control.indeterminate}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } } @@ -60,7 +60,7 @@ T.ProgressBar { states: [ {"disabled": !control.enabled}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } } @@ -76,7 +76,7 @@ T.ProgressBar { {"disabled": !control.enabled}, {"indeterminate": control.indeterminate}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } } @@ -101,7 +101,7 @@ T.ProgressBar { {"disabled": !control.enabled}, {"indeterminate": control.indeterminate}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } } diff --git a/src/quickcontrols2/imagine/RadioButton.qml b/src/quickcontrols2/imagine/RadioButton.qml index f3df31e86d..2f9335eb7c 100644 --- a/src/quickcontrols2/imagine/RadioButton.qml +++ b/src/quickcontrols2/imagine/RadioButton.qml @@ -39,7 +39,7 @@ T.RadioButton { {"checked": control.checked}, {"focused": control.visualFocus}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } } @@ -64,7 +64,7 @@ T.RadioButton { {"checked": control.checked}, {"focused": control.visualFocus}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } } diff --git a/src/quickcontrols2/imagine/RadioDelegate.qml b/src/quickcontrols2/imagine/RadioDelegate.qml index 621585bfee..f872798864 100644 --- a/src/quickcontrols2/imagine/RadioDelegate.qml +++ b/src/quickcontrols2/imagine/RadioDelegate.qml @@ -45,7 +45,7 @@ T.RadioDelegate { {"focused": control.visualFocus}, {"highlighted": control.highlighted}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } } @@ -75,7 +75,7 @@ T.RadioDelegate { {"focused": control.visualFocus}, {"highlighted": control.highlighted}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } } diff --git a/src/quickcontrols2/imagine/RangeSlider.qml b/src/quickcontrols2/imagine/RangeSlider.qml index b3a0a54245..e0559e65b3 100644 --- a/src/quickcontrols2/imagine/RangeSlider.qml +++ b/src/quickcontrols2/imagine/RangeSlider.qml @@ -75,7 +75,7 @@ T.RangeSlider { {"disabled": !control.enabled}, {"focused": control.visualFocus}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } @@ -93,7 +93,7 @@ T.RangeSlider { {"disabled": !control.enabled}, {"focused": control.visualFocus}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } } diff --git a/src/quickcontrols2/imagine/RoundButton.qml b/src/quickcontrols2/imagine/RoundButton.qml index b113fa0a3b..2000d92f85 100644 --- a/src/quickcontrols2/imagine/RoundButton.qml +++ b/src/quickcontrols2/imagine/RoundButton.qml @@ -57,7 +57,7 @@ T.RoundButton { {"highlighted": control.highlighted}, {"flat": control.flat}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } } diff --git a/src/quickcontrols2/imagine/ScrollBar.qml b/src/quickcontrols2/imagine/ScrollBar.qml index 118b93582f..09db8eea0b 100644 --- a/src/quickcontrols2/imagine/ScrollBar.qml +++ b/src/quickcontrols2/imagine/ScrollBar.qml @@ -40,7 +40,7 @@ T.ScrollBar { {"interactive": control.interactive}, {"pressed": control.pressed}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } opacity: 0.0 @@ -56,7 +56,7 @@ T.ScrollBar { {"interactive": control.interactive}, {"pressed": control.pressed}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } opacity: 0.0 diff --git a/src/quickcontrols2/imagine/ScrollIndicator.qml b/src/quickcontrols2/imagine/ScrollIndicator.qml index 8dee7648d4..285379a307 100644 --- a/src/quickcontrols2/imagine/ScrollIndicator.qml +++ b/src/quickcontrols2/imagine/ScrollIndicator.qml @@ -35,7 +35,7 @@ T.ScrollIndicator { {"horizontal": control.horizontal}, {"disabled": !control.enabled}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } opacity: 0.0 @@ -49,7 +49,7 @@ T.ScrollIndicator { {"horizontal": control.horizontal}, {"disabled": !control.enabled}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } opacity: 0.0 diff --git a/src/quickcontrols2/imagine/Slider.qml b/src/quickcontrols2/imagine/Slider.qml index b24a20edbd..01b5899fcb 100644 --- a/src/quickcontrols2/imagine/Slider.qml +++ b/src/quickcontrols2/imagine/Slider.qml @@ -37,7 +37,7 @@ T.Slider { {"pressed": control.pressed}, {"focused": control.visualFocus}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } } @@ -54,7 +54,7 @@ T.Slider { {"pressed": control.down}, {"focused": control.visualFocus}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } @@ -79,7 +79,7 @@ T.Slider { {"pressed": control.down}, {"focused": control.visualFocus}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } } diff --git a/src/quickcontrols2/imagine/SpinBox.qml b/src/quickcontrols2/imagine/SpinBox.qml index 9741077f9d..973cc1d1d6 100644 --- a/src/quickcontrols2/imagine/SpinBox.qml +++ b/src/quickcontrols2/imagine/SpinBox.qml @@ -62,7 +62,7 @@ T.SpinBox { {"disabled": !control.enabled}, {"focused": control.activeFocus}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } } @@ -112,7 +112,7 @@ T.SpinBox { {"editable": control.editable}, {"focused": control.activeFocus}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } } diff --git a/src/quickcontrols2/imagine/SwipeDelegate.qml b/src/quickcontrols2/imagine/SwipeDelegate.qml index a725754ded..24f550ce23 100644 --- a/src/quickcontrols2/imagine/SwipeDelegate.qml +++ b/src/quickcontrols2/imagine/SwipeDelegate.qml @@ -55,7 +55,7 @@ T.SwipeDelegate { {"focused": control.visualFocus}, {"highlighted": control.highlighted}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } } diff --git a/src/quickcontrols2/imagine/Switch.qml b/src/quickcontrols2/imagine/Switch.qml index fa623645c9..c2d3f70f2c 100644 --- a/src/quickcontrols2/imagine/Switch.qml +++ b/src/quickcontrols2/imagine/Switch.qml @@ -41,7 +41,7 @@ T.Switch { {"checked": control.checked}, {"focused": control.visualFocus}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } @@ -63,7 +63,7 @@ T.Switch { {"checked": control.checked}, {"focused": control.visualFocus}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } @@ -94,7 +94,7 @@ T.Switch { {"checked": control.checked}, {"focused": control.visualFocus}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } } diff --git a/src/quickcontrols2/imagine/SwitchDelegate.qml b/src/quickcontrols2/imagine/SwitchDelegate.qml index 4f8df1760f..ed8b93c2ba 100644 --- a/src/quickcontrols2/imagine/SwitchDelegate.qml +++ b/src/quickcontrols2/imagine/SwitchDelegate.qml @@ -47,7 +47,7 @@ T.SwitchDelegate { {"focused": control.visualFocus}, {"highlighted": control.highlighted}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } @@ -70,7 +70,7 @@ T.SwitchDelegate { {"focused": control.visualFocus}, {"highlighted": control.highlighted}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } @@ -106,7 +106,7 @@ T.SwitchDelegate { {"focused": control.visualFocus}, {"highlighted": control.highlighted}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } } diff --git a/src/quickcontrols2/imagine/TabButton.qml b/src/quickcontrols2/imagine/TabButton.qml index c7b37fc3fa..7b7a88c91b 100644 --- a/src/quickcontrols2/imagine/TabButton.qml +++ b/src/quickcontrols2/imagine/TabButton.qml @@ -51,7 +51,7 @@ T.TabButton { {"checked": control.checked}, {"focused": control.visualFocus}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } } diff --git a/src/quickcontrols2/imagine/TextArea.qml b/src/quickcontrols2/imagine/TextArea.qml index 3f0655fe0c..d47ffffbd7 100644 --- a/src/quickcontrols2/imagine/TextArea.qml +++ b/src/quickcontrols2/imagine/TextArea.qml @@ -56,7 +56,7 @@ T.TextArea { {"disabled": !control.enabled}, {"focused": control.activeFocus}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } } diff --git a/src/quickcontrols2/imagine/TextField.qml b/src/quickcontrols2/imagine/TextField.qml index 0b14971dd2..9c0ddd1f25 100644 --- a/src/quickcontrols2/imagine/TextField.qml +++ b/src/quickcontrols2/imagine/TextField.qml @@ -55,7 +55,7 @@ T.TextField { {"disabled": !control.enabled}, {"focused": control.activeFocus}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } } diff --git a/src/quickcontrols2/imagine/ToolButton.qml b/src/quickcontrols2/imagine/ToolButton.qml index 5e2132f0de..13b4c9b111 100644 --- a/src/quickcontrols2/imagine/ToolButton.qml +++ b/src/quickcontrols2/imagine/ToolButton.qml @@ -54,7 +54,7 @@ T.ToolButton { {"highlighted": control.highlighted}, {"flat": control.flat}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } } diff --git a/src/quickcontrols2/imagine/Tumbler.qml b/src/quickcontrols2/imagine/Tumbler.qml index 79d1b1745f..7052c6654c 100644 --- a/src/quickcontrols2/imagine/Tumbler.qml +++ b/src/quickcontrols2/imagine/Tumbler.qml @@ -56,7 +56,7 @@ T.Tumbler { {"disabled": !control.enabled}, {"focused": control.visualFocus}, {"mirrored": control.mirrored}, - {"hovered": control.hovered} + {"hovered": control.enabled && control.hovered} ] } } diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/FileDialogDelegate.qml b/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/FileDialogDelegate.qml index e2e0699be5..30094a7d9d 100644 --- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/FileDialogDelegate.qml +++ b/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/FileDialogDelegate.qml @@ -60,7 +60,7 @@ DialogsQuickImpl.FileDialogDelegate { { "focused": control.visualFocus }, { "highlighted": control.highlighted }, { "mirrored": control.mirrored }, - { "hovered": control.hovered } + { "hovered": control.enabled && control.hovered } ] } } diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/FolderDialogDelegate.qml b/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/FolderDialogDelegate.qml index 0dbd766e9a..64195c725a 100644 --- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/FolderDialogDelegate.qml +++ b/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/FolderDialogDelegate.qml @@ -54,7 +54,7 @@ DialogsQuickImpl.FileDialogDelegate { { "focused": control.visualFocus }, { "highlighted": control.highlighted }, { "mirrored": control.mirrored }, - { "hovered": control.hovered } + { "hovered": control.enabled && control.hovered } ] } } diff --git a/tests/manual/quickcontrols2/testbench/ControlContainer.qml b/tests/manual/quickcontrols2/testbench/ControlContainer.qml index 34688fb7dd..08d8190eed 100644 --- a/tests/manual/quickcontrols2/testbench/ControlContainer.qml +++ b/tests/manual/quickcontrols2/testbench/ControlContainer.qml @@ -8,6 +8,7 @@ Item { implicitWidth: delegate.implicitWidth implicitHeight: delegate.implicitHeight + enabled: false property var controlMetaObject property var states