From 799974dda000c2468953b1392e7dacaf64c33c4d Mon Sep 17 00:00:00 2001 From: Ivan Tkachenko Date: Fri, 24 Sep 2021 22:29:44 +0300 Subject: Use strict === equality for ScrollBar::orientation Change-Id: Icaf1bcda4a996cc3348911c87e43c4af2a246d73 Reviewed-by: Mitch Curtis (cherry picked from commit f5fc1d556da8f225275490cd539795ad8bba9bf2) Reviewed-by: Qt Cherry-pick Bot --- examples/quick/customitems/scrollbar/ScrollBar.qml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'examples/quick') diff --git a/examples/quick/customitems/scrollbar/ScrollBar.qml b/examples/quick/customitems/scrollbar/ScrollBar.qml index f2e46c5681..655335d78c 100644 --- a/examples/quick/customitems/scrollbar/ScrollBar.qml +++ b/examples/quick/customitems/scrollbar/ScrollBar.qml @@ -60,24 +60,24 @@ Item { // orientation can be either Qt.Vertical or Qt.Horizontal property real position property real pageSize - property variant orientation : Qt.Vertical + property int orientation : Qt.Vertical // A light, semi-transparent background Rectangle { id: background anchors.fill: parent - radius: orientation == Qt.Vertical ? (width/2 - 1) : (height/2 - 1) + radius: orientation === Qt.Vertical ? (width/2 - 1) : (height/2 - 1) color: "white" opacity: 0.3 } // Size the bar to the required size, depending upon the orientation. Rectangle { - x: orientation == Qt.Vertical ? 1 : (scrollBar.position * (scrollBar.width-2) + 1) - y: orientation == Qt.Vertical ? (scrollBar.position * (scrollBar.height-2) + 1) : 1 - width: orientation == Qt.Vertical ? (parent.width-2) : (scrollBar.pageSize * (scrollBar.width-2)) - height: orientation == Qt.Vertical ? (scrollBar.pageSize * (scrollBar.height-2)) : (parent.height-2) - radius: orientation == Qt.Vertical ? (width/2 - 1) : (height/2 - 1) + x: orientation === Qt.Vertical ? 1 : (scrollBar.position * (scrollBar.width-2) + 1) + y: orientation === Qt.Vertical ? (scrollBar.position * (scrollBar.height-2) + 1) : 1 + width: orientation === Qt.Vertical ? (parent.width-2) : (scrollBar.pageSize * (scrollBar.width-2)) + height: orientation === Qt.Vertical ? (scrollBar.pageSize * (scrollBar.height-2)) : (parent.height-2) + radius: orientation === Qt.Vertical ? (width/2 - 1) : (height/2 - 1) color: "black" opacity: 0.7 } -- cgit v1.2.3