aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/controls/ScrollIndicator.qml16
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols-scrollindicator-contentItem.png (renamed from src/imports/controls/doc/images/qtquickcontrols-scrollindicator-indicator.png)bin121 -> 121 bytes
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols-scrollindicator-contentItem.qml (renamed from src/imports/controls/doc/snippets/qtquickcontrols-scrollindicator-indicator.qml)2
-rw-r--r--src/imports/controls/doc/src/qtlabscontrols-customize.qdoc8
-rw-r--r--src/imports/controls/material/ScrollIndicator.qml16
-rw-r--r--src/imports/controls/plugins.qmltypes1
-rw-r--r--src/imports/controls/universal/ScrollIndicator.qml18
-rw-r--r--src/imports/templates/plugins.qmltypes1
8 files changed, 22 insertions, 40 deletions
diff --git a/src/imports/controls/ScrollIndicator.qml b/src/imports/controls/ScrollIndicator.qml
index e2fc23b1..4b09b35b 100644
--- a/src/imports/controls/ScrollIndicator.qml
+++ b/src/imports/controls/ScrollIndicator.qml
@@ -41,14 +41,14 @@ T.ScrollIndicator {
id: control
implicitWidth: Math.max(background ? background.implicitWidth : 0,
- indicator.implicitWidth + leftPadding + rightPadding)
+ contentItem.implicitWidth + leftPadding + rightPadding)
implicitHeight: Math.max(background ? background.implicitHeight : 0,
- indicator.implicitHeight + topPadding + bottomPadding)
+ contentItem.implicitHeight + topPadding + bottomPadding)
padding: 2
- //! [indicator]
- indicator: Rectangle {
+ //! [contentItem]
+ contentItem: Rectangle {
id: indicator
implicitWidth: 2
@@ -58,12 +58,6 @@ T.ScrollIndicator {
visible: control.size < 1.0
opacity: 0.0
- readonly property bool horizontal: control.orientation === Qt.Horizontal
- x: control.leftPadding + (horizontal ? control.position * control.width : 0)
- y: control.topPadding + (horizontal ? 0 : control.position * control.height)
- width: horizontal ? control.size * control.availableWidth : implicitWidth
- height: horizontal ? implicitHeight : control.size * control.availableHeight
-
states: State {
name: "active"
when: control.active
@@ -80,5 +74,5 @@ T.ScrollIndicator {
}
]
}
- //! [indicator]
+ //! [contentItem]
}
diff --git a/src/imports/controls/doc/images/qtquickcontrols-scrollindicator-indicator.png b/src/imports/controls/doc/images/qtquickcontrols-scrollindicator-contentItem.png
index 99266362..99266362 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-scrollindicator-indicator.png
+++ b/src/imports/controls/doc/images/qtquickcontrols-scrollindicator-contentItem.png
Binary files differ
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols-scrollindicator-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols-scrollindicator-contentItem.qml
index 68e0fb33..ef85fe69 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols-scrollindicator-indicator.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols-scrollindicator-contentItem.qml
@@ -34,7 +34,7 @@ ScrollIndicator {
active: true
height: 100
Rectangle {
- parent: indicator
+ parent: contentItem
anchors.fill: parent
color: "transparent"
border.color: "red"
diff --git a/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc b/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc
index 42774db9..daa74795 100644
--- a/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc
+++ b/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc
@@ -372,7 +372,7 @@
\section1 Customizing ScrollIndicator
ScrollIndicator consists of two visual items: \l {Control::background}{background}
- and \l {ScrollIndicator::indicator}{indicator}.
+ and \l {Control::contentItem}{content item}.
\section3 Background
@@ -380,11 +380,11 @@
ScrollIndicator has no background item by default.
- \section3 Indicator
+ \section3 Content item
- \image qtquickcontrols-scrollindicator-indicator.png
+ \image qtquickcontrols-scrollindicator-contentItem.png
- \snippet ScrollIndicator.qml indicator
+ \snippet ScrollIndicator.qml contentItem
\section1 Customizing Slider
diff --git a/src/imports/controls/material/ScrollIndicator.qml b/src/imports/controls/material/ScrollIndicator.qml
index f92b366f..e3a9bd95 100644
--- a/src/imports/controls/material/ScrollIndicator.qml
+++ b/src/imports/controls/material/ScrollIndicator.qml
@@ -42,14 +42,14 @@ T.ScrollIndicator {
id: control
implicitWidth: Math.max(background ? background.implicitWidth : 0,
- indicator.implicitWidth + leftPadding + rightPadding)
+ contentItem.implicitWidth + leftPadding + rightPadding)
implicitHeight: Math.max(background ? background.implicitHeight : 0,
- indicator.implicitHeight + topPadding + bottomPadding)
+ contentItem.implicitHeight + topPadding + bottomPadding)
padding: 2
- //! [indicator]
- indicator: Rectangle {
+ //! [contentItem]
+ contentItem: Rectangle {
id: indicator
implicitWidth: 4
@@ -59,12 +59,6 @@ T.ScrollIndicator {
visible: control.size < 1.0
opacity: 0.0
- readonly property bool horizontal: control.orientation === Qt.Horizontal
- x: control.leftPadding + (horizontal ? control.position * control.width : 0)
- y: control.topPadding + (horizontal ? 0 : control.position * control.height)
- width: horizontal ? control.size * control.availableWidth : implicitWidth
- height: horizontal ? implicitHeight : control.size * control.availableHeight
-
states: State {
name: "active"
when: control.active
@@ -81,5 +75,5 @@ T.ScrollIndicator {
}
]
}
- //! [indicator]
+ //! [contentItem]
}
diff --git a/src/imports/controls/plugins.qmltypes b/src/imports/controls/plugins.qmltypes
index e8083e6b..08597083 100644
--- a/src/imports/controls/plugins.qmltypes
+++ b/src/imports/controls/plugins.qmltypes
@@ -529,7 +529,6 @@ Module {
Property { name: "position"; type: "double" }
Property { name: "active"; type: "bool" }
Property { name: "orientation"; type: "Qt::Orientation" }
- Property { name: "indicator"; type: "QQuickItem"; isPointer: true }
Method {
name: "setSize"
Parameter { name: "size"; type: "double" }
diff --git a/src/imports/controls/universal/ScrollIndicator.qml b/src/imports/controls/universal/ScrollIndicator.qml
index 5787b60a..0e82b631 100644
--- a/src/imports/controls/universal/ScrollIndicator.qml
+++ b/src/imports/controls/universal/ScrollIndicator.qml
@@ -42,12 +42,14 @@ T.ScrollIndicator {
id: control
implicitWidth: Math.max(background ? background.implicitWidth : 0,
- indicator.implicitWidth + leftPadding + rightPadding)
+ contentItem.implicitWidth + leftPadding + rightPadding)
implicitHeight: Math.max(background ? background.implicitHeight : 0,
- indicator.implicitHeight + topPadding + bottomPadding)
+ contentItem.implicitHeight + topPadding + bottomPadding)
+
+ //! [contentItem]
+ contentItem: Rectangle {
+ id: indicator
- //! [indicator]
- indicator: Rectangle {
implicitWidth: 6
implicitHeight: 6
@@ -55,12 +57,6 @@ T.ScrollIndicator {
visible: control.size < 1.0
opacity: 0.0
- readonly property bool horizontal: control.orientation === Qt.Horizontal
- x: control.leftPadding + (horizontal ? control.position * control.width : 0)
- y: control.topPadding + (horizontal ? 0 : control.position * control.height)
- width: horizontal ? control.size * control.availableWidth : implicitWidth
- height: horizontal ? implicitHeight : control.size * control.availableHeight
-
states: [
State {
name: "active"
@@ -82,5 +78,5 @@ T.ScrollIndicator {
}
]
}
- //! [indicator]
+ //! [contentItem]
}
diff --git a/src/imports/templates/plugins.qmltypes b/src/imports/templates/plugins.qmltypes
index 229a194e..94cdf8cc 100644
--- a/src/imports/templates/plugins.qmltypes
+++ b/src/imports/templates/plugins.qmltypes
@@ -523,7 +523,6 @@ Module {
Property { name: "position"; type: "double" }
Property { name: "active"; type: "bool" }
Property { name: "orientation"; type: "Qt::Orientation" }
- Property { name: "indicator"; type: "QQuickItem"; isPointer: true }
Method {
name: "setSize"
Parameter { name: "size"; type: "double" }
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 07:58:27 +0000