aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFabian Kosmale <fabian.kosmale@qt.io>2023-04-18 11:30:58 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-09-08 20:30:40 +0000
commit3267be5b058b18cc499a92ee394949a6885ec109 (patch)
treebfb6f1ad263986af8cf4708154e17a8f49c79ba7 /src
parent466877e8de32ec26e403fcb07205cb4b11694798 (diff)
Windows native style: Mark ScrollBar as non-customizable
Consequently, remove code that supported setting a non-native contentItem. Task-number: QTBUG-107771 Change-Id: I871156c567f85db6e1b8247dcc6c2ea6a350cd4d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 901a8bf768abc3672e512b3f481b24ac0e1afb52) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
-rw-r--r--src/quickcontrols/windows/ScrollBar.qml15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/quickcontrols/windows/ScrollBar.qml b/src/quickcontrols/windows/ScrollBar.qml
index 6906f7dfa2..80fbf74e75 100644
--- a/src/quickcontrols/windows/ScrollBar.qml
+++ b/src/quickcontrols/windows/ScrollBar.qml
@@ -7,6 +7,8 @@ import QtQuick.NativeStyle as NativeStyle
NativeStyle.DefaultScrollBar {
id: controlRoot
+ readonly property bool __notCustomizable: true
+
topPadding: orientation === Qt.Vertical ? controlRoot.__decreaseVisual.indicator.height : 0
bottomPadding: orientation === Qt.Vertical ? controlRoot.__increaseVisual.indicator.height : 0
leftPadding: orientation === Qt.Horizontal ? controlRoot.__decreaseVisual.indicator.width : 0
@@ -15,6 +17,8 @@ NativeStyle.DefaultScrollBar {
contentItem: NativeStyle.ScrollBar {
control: controlRoot
subControl: NativeStyle.ScrollBar.Handle
+
+ readonly property bool __ignoreNotCustomizable: true
}
NativeStyle.ScrollBar {
@@ -29,7 +33,6 @@ NativeStyle.DefaultScrollBar {
subControl: NativeStyle.ScrollBar.Handle
overrideState: NativeStyle.StyleItem.AlwaysHovered
opacity: controlRoot.hovered || control.pressed ? 1 : 0
- visible: contentItem instanceof NativeStyle.StyleItem
Behavior on opacity { NumberAnimation { duration: contentItem.transitionDuration } }
}
@@ -47,6 +50,8 @@ NativeStyle.DefaultScrollBar {
control: controlRoot
subControl: NativeStyle.ScrollBar.Groove
overrideState: NativeStyle.ScrollBar.NeverHovered
+
+ readonly property bool __ignoreNotCustomizable: true
}
__decreaseVisual.indicator: NativeStyle.ScrollBar {
@@ -54,9 +59,10 @@ NativeStyle.DefaultScrollBar {
subControl: NativeStyle.ScrollBar.SubLine
overrideState: NativeStyle.ScrollBar.AlwaysHovered
opacity: controlRoot.__decreaseVisual.hovered ? 1 : 0
- visible: contentItem instanceof NativeStyle.StyleItem
Behavior on opacity { NumberAnimation { duration: contentItem.transitionDuration } }
useNinePatchImage: false
+
+ readonly property bool __ignoreNotCustomizable: true
}
NativeStyle.ScrollBar {
@@ -64,7 +70,6 @@ NativeStyle.DefaultScrollBar {
subControl: NativeStyle.ScrollBar.SubLine
overrideState: NativeStyle.ScrollBar.AlwaysSunken
opacity: controlRoot.__decreaseVisual.pressed ? 1 : 0
- visible: contentItem instanceof NativeStyle.StyleItem
useNinePatchImage: false
z: 1
}
@@ -76,9 +81,10 @@ NativeStyle.DefaultScrollBar {
y: orientation === Qt.Vertical ? controlRoot.height - height : 0
overrideState: NativeStyle.ScrollBar.AlwaysHovered
opacity: controlRoot.__increaseVisual.hovered ? 1 : 0
- visible: contentItem instanceof NativeStyle.StyleItem
Behavior on opacity { NumberAnimation { duration: contentItem.transitionDuration } }
useNinePatchImage: false
+
+ readonly property bool __ignoreNotCustomizable: true
}
NativeStyle.ScrollBar {
@@ -89,7 +95,6 @@ NativeStyle.DefaultScrollBar {
z: 1
overrideState: NativeStyle.ScrollBar.AlwaysSunken
opacity: controlRoot.__increaseVisual.pressed ? 1 : 0
- visible: contentItem instanceof NativeStyle.StyleItem
useNinePatchImage: false
}
}