aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/fusion
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports/controls/fusion')
-rw-r--r--src/imports/controls/fusion/ButtonPanel.qml4
-rw-r--r--src/imports/controls/fusion/CheckBox.qml2
-rw-r--r--src/imports/controls/fusion/CheckIndicator.qml6
-rw-r--r--src/imports/controls/fusion/ComboBox.qml16
-rw-r--r--src/imports/controls/fusion/Dial.qml10
-rw-r--r--src/imports/controls/fusion/Page.qml2
-rw-r--r--src/imports/controls/fusion/Pane.qml2
-rw-r--r--src/imports/controls/fusion/RadioButton.qml2
-rw-r--r--src/imports/controls/fusion/RadioIndicator.qml4
-rw-r--r--src/imports/controls/fusion/ScrollBar.qml1
-rw-r--r--src/imports/controls/fusion/SliderGroove.qml18
-rw-r--r--src/imports/controls/fusion/SpinBox.qml4
-rw-r--r--src/imports/controls/fusion/Switch.qml2
-rw-r--r--src/imports/controls/fusion/SwitchDelegate.qml2
-rw-r--r--src/imports/controls/fusion/SwitchIndicator.qml30
-rw-r--r--src/imports/controls/fusion/Tumbler.qml8
-rw-r--r--src/imports/controls/fusion/plugins.qmltypes202
-rw-r--r--src/imports/controls/fusion/qquickfusionstyle.cpp4
18 files changed, 258 insertions, 61 deletions
diff --git a/src/imports/controls/fusion/ButtonPanel.qml b/src/imports/controls/fusion/ButtonPanel.qml
index 3250044b..125aa2f3 100644
--- a/src/imports/controls/fusion/ButtonPanel.qml
+++ b/src/imports/controls/fusion/ButtonPanel.qml
@@ -55,11 +55,11 @@ Rectangle {
id: buttonGradient
GradientStop {
position: 0
- color: Fusion.gradientStart(Fusion.buttonColor(control.palette, panel.highlighted, control.down, control.hovered))
+ color: Fusion.gradientStart(Fusion.buttonColor(panel.control.palette, panel.highlighted, panel.control.down, panel.control.hovered))
}
GradientStop {
position: 1
- color: Fusion.gradientStop(Fusion.buttonColor(control.palette, panel.highlighted, control.down, control.hovered))
+ color: Fusion.gradientStop(Fusion.buttonColor(panel.control.palette, panel.highlighted, panel.control.down, panel.control.hovered))
}
}
diff --git a/src/imports/controls/fusion/CheckBox.qml b/src/imports/controls/fusion/CheckBox.qml
index f90c80fb..edb4c77f 100644
--- a/src/imports/controls/fusion/CheckBox.qml
+++ b/src/imports/controls/fusion/CheckBox.qml
@@ -54,7 +54,7 @@ T.CheckBox {
spacing: 6
indicator: CheckIndicator {
- x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2
+ x: control.text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2
y: control.topPadding + (control.availableHeight - height) / 2
control: control
}
diff --git a/src/imports/controls/fusion/CheckIndicator.qml b/src/imports/controls/fusion/CheckIndicator.qml
index 314a6798..7dcfee30 100644
--- a/src/imports/controls/fusion/CheckIndicator.qml
+++ b/src/imports/controls/fusion/CheckIndicator.qml
@@ -59,7 +59,7 @@ Rectangle {
width: parent.width - 2
height: 1
color: Fusion.topShadow
- visible: control.enabled && !control.down
+ visible: indicator.control.enabled && !indicator.control.down
}
ColorImage {
@@ -67,7 +67,7 @@ Rectangle {
y: (parent.height - height) / 2
color: Color.transparent(indicator.checkMarkColor, 210 / 255)
source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Fusion/images/checkmark.png"
- visible: control.checkState === Qt.Checked || (control.checked && control.checkState === undefined)
+ visible: indicator.control.checkState === Qt.Checked || (indicator.control.checked && indicator.control.checkState === undefined)
}
Rectangle {
@@ -75,7 +75,7 @@ Rectangle {
width: parent.width - 6
height: parent.width - 6
- visible: control.checkState === Qt.PartiallyChecked
+ visible: indicator.control.checkState === Qt.PartiallyChecked
gradient: Gradient {
GradientStop {
diff --git a/src/imports/controls/fusion/ComboBox.qml b/src/imports/controls/fusion/ComboBox.qml
index 3ecb0cf2..e9b836ef 100644
--- a/src/imports/controls/fusion/ComboBox.qml
+++ b/src/imports/controls/fusion/ComboBox.qml
@@ -34,13 +34,13 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Window 2.12
-import QtQuick.Templates 2.12 as T
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
-import QtQuick.Controls.Fusion 2.12
-import QtQuick.Controls.Fusion.impl 2.12
+import QtQuick 2.14
+import QtQuick.Window 2.14
+import QtQuick.Templates 2.14 as T
+import QtQuick.Controls 2.14
+import QtQuick.Controls.impl 2.14
+import QtQuick.Controls.Fusion 2.14
+import QtQuick.Controls.Fusion.impl 2.14
T.ComboBox {
id: control
@@ -159,7 +159,7 @@ T.ComboBox {
}
background: Rectangle {
- color: popup.palette.window
+ color: control.popup.palette.window
border.color: Fusion.outline(control.palette)
Rectangle {
diff --git a/src/imports/controls/fusion/Dial.qml b/src/imports/controls/fusion/Dial.qml
index 423087c9..a1337242 100644
--- a/src/imports/controls/fusion/Dial.qml
+++ b/src/imports/controls/fusion/Dial.qml
@@ -57,19 +57,19 @@ T.Dial {
}
handle: KnobImpl {
- x: background.x + background.width / 2 - handle.width / 2
- y: background.y + background.height / 2 - handle.height / 2
+ x: control.background.x + control.background.width / 2 - control.handle.width / 2
+ y: control.background.y + control.background.height / 2 - control.handle.height / 2
width: control.width / 7
height: control.height / 7
palette: control.palette
transform: [
Translate {
- y: -Math.min(background.width, background.height) * 0.42 + handle.height
+ y: -Math.min(control.background.width, control.background.height) * 0.42 + control.handle.height
},
Rotation {
angle: control.angle
- origin.x: handle.width / 2
- origin.y: handle.height / 2
+ origin.x: control.handle.width / 2
+ origin.y: control.handle.height / 2
}
]
}
diff --git a/src/imports/controls/fusion/Page.qml b/src/imports/controls/fusion/Page.qml
index 796dff1c..ce4b1d54 100644
--- a/src/imports/controls/fusion/Page.qml
+++ b/src/imports/controls/fusion/Page.qml
@@ -54,6 +54,6 @@ T.Page {
+ (implicitFooterHeight > 0 ? implicitFooterHeight + spacing : 0))
background: Rectangle {
- color: palette.window
+ color: control.palette.window
}
}
diff --git a/src/imports/controls/fusion/Pane.qml b/src/imports/controls/fusion/Pane.qml
index 69fbdca0..28be3b47 100644
--- a/src/imports/controls/fusion/Pane.qml
+++ b/src/imports/controls/fusion/Pane.qml
@@ -52,6 +52,6 @@ T.Pane {
padding: 9
background: Rectangle {
- color: palette.window
+ color: control.palette.window
}
}
diff --git a/src/imports/controls/fusion/RadioButton.qml b/src/imports/controls/fusion/RadioButton.qml
index fed6fa7c..a940aff3 100644
--- a/src/imports/controls/fusion/RadioButton.qml
+++ b/src/imports/controls/fusion/RadioButton.qml
@@ -54,7 +54,7 @@ T.RadioButton {
spacing: 6
indicator: RadioIndicator {
- x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2
+ x: control.text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2
y: control.topPadding + (control.availableHeight - height) / 2
control: control
}
diff --git a/src/imports/controls/fusion/RadioIndicator.qml b/src/imports/controls/fusion/RadioIndicator.qml
index 4b67d24e..c73cd49f 100644
--- a/src/imports/controls/fusion/RadioIndicator.qml
+++ b/src/imports/controls/fusion/RadioIndicator.qml
@@ -62,7 +62,7 @@ Rectangle {
radius: width / 2
color: "transparent"
border.color: Fusion.topShadow
- visible: control.enabled && !control.down
+ visible: indicator.control.enabled && !indicator.control.down
}
Rectangle {
@@ -73,6 +73,6 @@ Rectangle {
radius: width / 2
color: Color.transparent(indicator.checkMarkColor, 180 / 255)
border.color: Color.transparent(indicator.checkMarkColor, 200 / 255)
- visible: control.checked
+ visible: indicator.control.checked
}
}
diff --git a/src/imports/controls/fusion/ScrollBar.qml b/src/imports/controls/fusion/ScrollBar.qml
index e4fb7949..93b58f0e 100644
--- a/src/imports/controls/fusion/ScrollBar.qml
+++ b/src/imports/controls/fusion/ScrollBar.qml
@@ -51,6 +51,7 @@ T.ScrollBar {
padding: 2
visible: control.policy !== T.ScrollBar.AlwaysOff
+ minimumSize: orientation == Qt.Horizontal ? height / width : width / height
contentItem: Rectangle {
implicitWidth: control.interactive ? 6 : 2
diff --git a/src/imports/controls/fusion/SliderGroove.qml b/src/imports/controls/fusion/SliderGroove.qml
index c34217a8..381a02b5 100644
--- a/src/imports/controls/fusion/SliderGroove.qml
+++ b/src/imports/controls/fusion/SliderGroove.qml
@@ -63,31 +63,31 @@ Rectangle {
gradient: Gradient {
GradientStop {
position: 0
- color: Qt.darker(Fusion.grooveColor(control.palette), 1.1)
+ color: Qt.darker(Fusion.grooveColor(groove.control.palette), 1.1)
}
GradientStop {
position: 1
- color: Qt.lighter(Fusion.grooveColor(control.palette), 1.1)
+ color: Qt.lighter(Fusion.grooveColor(groove.control.palette), 1.1)
}
}
Rectangle {
- x: control.horizontal ? groove.offset * parent.width : 0
- y: control.horizontal ? 0 : groove.visualProgress * parent.height
- width: control.horizontal ? groove.progress * parent.width - groove.offset * parent.width : 5
- height: control.horizontal ? 5 : groove.progress * parent.height - groove.offset * parent.height
+ x: groove.control.horizontal ? groove.offset * parent.width : 0
+ y: groove.control.horizontal ? 0 : groove.visualProgress * parent.height
+ width: groove.control.horizontal ? groove.progress * parent.width - groove.offset * parent.width : 5
+ height: groove.control.horizontal ? 5 : groove.progress * parent.height - groove.offset * parent.height
radius: 2
- border.color: Qt.darker(Fusion.highlightedOutline(control.palette), 1.1)
+ border.color: Qt.darker(Fusion.highlightedOutline(groove.control.palette), 1.1)
gradient: Gradient {
GradientStop {
position: 0
- color: Fusion.highlight(control.palette)
+ color: Fusion.highlight(groove.control.palette)
}
GradientStop {
position: 1
- color: Qt.lighter(Fusion.highlight(control.palette), 1.2)
+ color: Qt.lighter(Fusion.highlight(groove.control.palette), 1.2)
}
}
}
diff --git a/src/imports/controls/fusion/SpinBox.qml b/src/imports/controls/fusion/SpinBox.qml
index fd77f9f3..41754f63 100644
--- a/src/imports/controls/fusion/SpinBox.qml
+++ b/src/imports/controls/fusion/SpinBox.qml
@@ -145,8 +145,8 @@ T.SpinBox {
Rectangle {
x: control.mirrored ? 1 : parent.width - width - 1
y: 1
- width: Math.max(up.indicator ? up.indicator.width : 0,
- down.indicator ? down.indicator.width : 0) + 1
+ width: Math.max(control.up.indicator ? control.up.indicator.width : 0,
+ control.down.indicator ? control.down.indicator.width : 0) + 1
height: parent.height - 2
radius: 2
diff --git a/src/imports/controls/fusion/Switch.qml b/src/imports/controls/fusion/Switch.qml
index edcb3650..bf18003a 100644
--- a/src/imports/controls/fusion/Switch.qml
+++ b/src/imports/controls/fusion/Switch.qml
@@ -54,7 +54,7 @@ T.Switch {
spacing: 6
indicator: SwitchIndicator {
- x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2
+ x: control.text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2
y: control.topPadding + (control.availableHeight - height) / 2
control: control
}
diff --git a/src/imports/controls/fusion/SwitchDelegate.qml b/src/imports/controls/fusion/SwitchDelegate.qml
index 0db13b41..67c41924 100644
--- a/src/imports/controls/fusion/SwitchDelegate.qml
+++ b/src/imports/controls/fusion/SwitchDelegate.qml
@@ -57,7 +57,7 @@ T.SwitchDelegate {
icon.height: 16
indicator: SwitchIndicator {
- x: text ? (control.mirrored ? control.leftPadding : control.width - width - control.rightPadding) : control.leftPadding + (control.availableWidth - width) / 2
+ x: control.text ? (control.mirrored ? control.leftPadding : control.width - width - control.rightPadding) : control.leftPadding + (control.availableWidth - width) / 2
y: control.topPadding + (control.availableHeight - height) / 2
control: control
}
diff --git a/src/imports/controls/fusion/SwitchIndicator.qml b/src/imports/controls/fusion/SwitchIndicator.qml
index f89388c7..ae7c89a0 100644
--- a/src/imports/controls/fusion/SwitchIndicator.qml
+++ b/src/imports/controls/fusion/SwitchIndicator.qml
@@ -56,44 +56,44 @@ Rectangle {
gradient: Gradient {
GradientStop {
position: 0
- color: Qt.darker(Fusion.grooveColor(control.palette), 1.1)
+ color: Qt.darker(Fusion.grooveColor(indicator.control.palette), 1.1)
}
GradientStop {
position: 1
- color: Qt.lighter(Fusion.grooveColor(control.palette), 1.1)
+ color: Qt.lighter(Fusion.grooveColor(indicator.control.palette), 1.1)
}
}
Rectangle {
- x: control.mirrored ? handle.x : 0
- width: control.mirrored ? parent.width - handle.x : handle.x + handle.width
+ x: indicator.control.mirrored ? handle.x : 0
+ width: indicator.control.mirrored ? parent.width - handle.x : handle.x + handle.width
height: parent.height
- opacity: control.checked ? 1 : 0
+ opacity: indicator.control.checked ? 1 : 0
Behavior on opacity {
- enabled: !control.down
+ enabled: !indicator.control.down
NumberAnimation { duration: 80 }
}
radius: 2
- border.color: Qt.darker(Fusion.highlightedOutline(control.palette), 1.1)
- border.width: control.enabled ? 1 : 0
+ border.color: Qt.darker(Fusion.highlightedOutline(indicator.control.palette), 1.1)
+ border.width: indicator.control.enabled ? 1 : 0
gradient: Gradient {
GradientStop {
position: 0
- color: Fusion.highlight(control.palette)
+ color: Fusion.highlight(indicator.control.palette)
}
GradientStop {
position: 1
- color: Qt.lighter(Fusion.highlight(control.palette), 1.2)
+ color: Qt.lighter(Fusion.highlight(indicator.control.palette), 1.2)
}
}
}
Rectangle {
id: handle
- x: Math.max(0, Math.min(parent.width - width, control.visualPosition * parent.width - (width / 2)))
+ x: Math.max(0, Math.min(parent.width - width, indicator.control.visualPosition * parent.width - (width / 2)))
y: (parent.height - height) / 2
width: 20
height: 16
@@ -102,11 +102,11 @@ Rectangle {
gradient: Gradient {
GradientStop {
position: 0
- color: Fusion.gradientStart(Fusion.buttonColor(control.palette, control.visualFocus, control.pressed, control.hovered))
+ color: Fusion.gradientStart(Fusion.buttonColor(indicator.control.palette, indicator.control.visualFocus, indicator.control.pressed, indicator.control.hovered))
}
GradientStop {
position: 1
- color: Fusion.gradientStop(Fusion.buttonColor(control.palette, control.visualFocus, control.pressed, control.hovered))
+ color: Fusion.gradientStop(Fusion.buttonColor(indicator.control.palette, indicator.control.visualFocus, indicator.control.pressed, indicator.control.hovered))
}
}
border.width: 1
@@ -115,7 +115,7 @@ Rectangle {
Rectangle {
width: parent.width
height: parent.height
- border.color: control.visualFocus ? Fusion.highlightedOutline(control.palette) : Fusion.outline(control.palette)
+ border.color: indicator.control.visualFocus ? Fusion.highlightedOutline(indicator.control.palette) : Fusion.outline(indicator.control.palette)
color: "transparent"
radius: 2
@@ -130,7 +130,7 @@ Rectangle {
}
Behavior on x {
- enabled: !control.down
+ enabled: !indicator.control.down
SmoothedAnimation { velocity: 200 }
}
}
diff --git a/src/imports/controls/fusion/Tumbler.qml b/src/imports/controls/fusion/Tumbler.qml
index 6abf7b5a..0129f06c 100644
--- a/src/imports/controls/fusion/Tumbler.qml
+++ b/src/imports/controls/fusion/Tumbler.qml
@@ -64,11 +64,11 @@ T.Tumbler {
model: control.model
delegate: control.delegate
path: Path {
- startX: contentItem.width / 2
- startY: -contentItem.delegateHeight / 2
+ startX: control.contentItem.width / 2
+ startY: -control.contentItem.delegateHeight / 2
PathLine {
- x: contentItem.width / 2
- y: (control.visibleItemCount + 1) * contentItem.delegateHeight - contentItem.delegateHeight / 2
+ x: control.contentItem.width / 2
+ y: (control.visibleItemCount + 1) * control.contentItem.delegateHeight - control.contentItem.delegateHeight / 2
}
}
diff --git a/src/imports/controls/fusion/plugins.qmltypes b/src/imports/controls/fusion/plugins.qmltypes
index a70b4901..5140d1e8 100644
--- a/src/imports/controls/fusion/plugins.qmltypes
+++ b/src/imports/controls/fusion/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
// It is used for QML tooling purposes only.
//
// This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick.Controls.Fusion 2.13'
+// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick.Controls.Fusion 2.14'
Module {
dependencies: ["QtQuick.Controls 2.0"]
@@ -144,6 +144,206 @@ Module {
}
}
Component {
+ name: "QQuickItem"
+ defaultProperty: "data"
+ prototype: "QObject"
+ Enum {
+ name: "Flags"
+ values: {
+ "ItemClipsChildrenToShape": 1,
+ "ItemAcceptsInputMethod": 2,
+ "ItemIsFocusScope": 4,
+ "ItemHasContents": 8,
+ "ItemAcceptsDrops": 16
+ }
+ }
+ Enum {
+ name: "TransformOrigin"
+ values: {
+ "TopLeft": 0,
+ "Top": 1,
+ "TopRight": 2,
+ "Left": 3,
+ "Center": 4,
+ "Right": 5,
+ "BottomLeft": 6,
+ "Bottom": 7,
+ "BottomRight": 8
+ }
+ }
+ Property { name: "parent"; type: "QQuickItem"; isPointer: true }
+ Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
+ Property { name: "resources"; type: "QObject"; isList: true; isReadonly: true }
+ Property { name: "children"; type: "QQuickItem"; isList: true; isReadonly: true }
+ Property { name: "x"; type: "double" }
+ Property { name: "y"; type: "double" }
+ Property { name: "z"; type: "double" }
+ Property { name: "width"; type: "double" }
+ Property { name: "height"; type: "double" }
+ Property { name: "opacity"; type: "double" }
+ Property { name: "enabled"; type: "bool" }
+ Property { name: "visible"; type: "bool" }
+ Property { name: "visibleChildren"; type: "QQuickItem"; isList: true; isReadonly: true }
+ Property { name: "states"; type: "QQuickState"; isList: true; isReadonly: true }
+ Property { name: "transitions"; type: "QQuickTransition"; isList: true; isReadonly: true }
+ Property { name: "state"; type: "string" }
+ Property { name: "childrenRect"; type: "QRectF"; isReadonly: true }
+ Property { name: "anchors"; type: "QQuickAnchors"; isReadonly: true; isPointer: true }
+ Property { name: "left"; type: "QQuickAnchorLine"; isReadonly: true }
+ Property { name: "right"; type: "QQuickAnchorLine"; isReadonly: true }
+ Property { name: "horizontalCenter"; type: "QQuickAnchorLine"; isReadonly: true }
+ Property { name: "top"; type: "QQuickAnchorLine"; isReadonly: true }
+ Property { name: "bottom"; type: "QQuickAnchorLine"; isReadonly: true }
+ Property { name: "verticalCenter"; type: "QQuickAnchorLine"; isReadonly: true }
+ Property { name: "baseline"; type: "QQuickAnchorLine"; isReadonly: true }
+ Property { name: "baselineOffset"; type: "double" }
+ Property { name: "clip"; type: "bool" }
+ Property { name: "focus"; type: "bool" }
+ Property { name: "activeFocus"; type: "bool"; isReadonly: true }
+ Property { name: "activeFocusOnTab"; revision: 1; type: "bool" }
+ Property { name: "rotation"; type: "double" }
+ Property { name: "scale"; type: "double" }
+ Property { name: "transformOrigin"; type: "TransformOrigin" }
+ Property { name: "transformOriginPoint"; type: "QPointF"; isReadonly: true }
+ Property { name: "transform"; type: "QQuickTransform"; isList: true; isReadonly: true }
+ Property { name: "smooth"; type: "bool" }
+ Property { name: "antialiasing"; type: "bool" }
+ Property { name: "implicitWidth"; type: "double" }
+ Property { name: "implicitHeight"; type: "double" }
+ Property { name: "containmentMask"; revision: 11; type: "QObject"; isPointer: true }
+ Property { name: "layer"; type: "QQuickItemLayer"; isReadonly: true; isPointer: true }
+ Signal {
+ name: "childrenRectChanged"
+ Parameter { type: "QRectF" }
+ }
+ Signal {
+ name: "baselineOffsetChanged"
+ Parameter { type: "double" }
+ }
+ Signal {
+ name: "stateChanged"
+ Parameter { type: "string" }
+ }
+ Signal {
+ name: "focusChanged"
+ Parameter { type: "bool" }
+ }
+ Signal {
+ name: "activeFocusChanged"
+ Parameter { type: "bool" }
+ }
+ Signal {
+ name: "activeFocusOnTabChanged"
+ revision: 1
+ Parameter { type: "bool" }
+ }
+ Signal {
+ name: "parentChanged"
+ Parameter { type: "QQuickItem"; isPointer: true }
+ }
+ Signal {
+ name: "transformOriginChanged"
+ Parameter { type: "TransformOrigin" }
+ }
+ Signal {
+ name: "smoothChanged"
+ Parameter { type: "bool" }
+ }
+ Signal {
+ name: "antialiasingChanged"
+ Parameter { type: "bool" }
+ }
+ Signal {
+ name: "clipChanged"
+ Parameter { type: "bool" }
+ }
+ Signal {
+ name: "windowChanged"
+ revision: 1
+ Parameter { name: "window"; type: "QQuickWindow"; isPointer: true }
+ }
+ Signal { name: "containmentMaskChanged"; revision: 11 }
+ Method { name: "update" }
+ Method {
+ name: "grabToImage"
+ revision: 4
+ type: "bool"
+ Parameter { name: "callback"; type: "QJSValue" }
+ Parameter { name: "targetSize"; type: "QSize" }
+ }
+ Method {
+ name: "grabToImage"
+ revision: 4
+ type: "bool"
+ Parameter { name: "callback"; type: "QJSValue" }
+ }
+ Method {
+ name: "contains"
+ type: "bool"
+ Parameter { name: "point"; type: "QPointF" }
+ }
+ Method {
+ name: "mapFromItem"
+ Parameter { type: "QQmlV4Function"; isPointer: true }
+ }
+ Method {
+ name: "mapToItem"
+ Parameter { type: "QQmlV4Function"; isPointer: true }
+ }
+ Method {
+ name: "mapFromGlobal"
+ revision: 7
+ Parameter { type: "QQmlV4Function"; isPointer: true }
+ }
+ Method {
+ name: "mapToGlobal"
+ revision: 7
+ Parameter { type: "QQmlV4Function"; isPointer: true }
+ }
+ Method { name: "forceActiveFocus" }
+ Method {
+ name: "forceActiveFocus"
+ Parameter { name: "reason"; type: "Qt::FocusReason" }
+ }
+ Method {
+ name: "nextItemInFocusChain"
+ revision: 1
+ type: "QQuickItem*"
+ Parameter { name: "forward"; type: "bool" }
+ }
+ Method { name: "nextItemInFocusChain"; revision: 1; type: "QQuickItem*" }
+ Method {
+ name: "childAt"
+ type: "QQuickItem*"
+ Parameter { name: "x"; type: "double" }
+ Parameter { name: "y"; type: "double" }
+ }
+ }
+ Component {
+ name: "QQuickPaintedItem"
+ defaultProperty: "data"
+ prototype: "QQuickItem"
+ Enum {
+ name: "RenderTarget"
+ values: {
+ "Image": 0,
+ "FramebufferObject": 1,
+ "InvertedYFramebufferObject": 2
+ }
+ }
+ Enum {
+ name: "PerformanceHints"
+ values: {
+ "FastFBOResizing": 1
+ }
+ }
+ Property { name: "contentsSize"; type: "QSize" }
+ Property { name: "fillColor"; type: "QColor" }
+ Property { name: "contentsScale"; type: "double" }
+ Property { name: "renderTarget"; type: "RenderTarget" }
+ Property { name: "textureSize"; type: "QSize" }
+ }
+ Component {
prototype: "QQuickRectangle"
name: "QtQuick.Controls.Fusion.impl/ButtonPanel 2.3"
exports: ["QtQuick.Controls.Fusion.impl/ButtonPanel 2.3"]
diff --git a/src/imports/controls/fusion/qquickfusionstyle.cpp b/src/imports/controls/fusion/qquickfusionstyle.cpp
index 7797463a..364f8a75 100644
--- a/src/imports/controls/fusion/qquickfusionstyle.cpp
+++ b/src/imports/controls/fusion/qquickfusionstyle.cpp
@@ -80,8 +80,6 @@ QColor QQuickFusionStyle::highlightedText(const QPalette &palette)
QColor QQuickFusionStyle::outline(const QPalette &palette)
{
- if (palette.window().style() == Qt::TexturePattern)
- return QColor(0, 0, 0, 160);
return palette.window().color().darker(140);
}
@@ -95,8 +93,6 @@ QColor QQuickFusionStyle::highlightedOutline(const QPalette &palette)
QColor QQuickFusionStyle::tabFrameColor(const QPalette &palette)
{
- if (palette.window().style() == Qt::TexturePattern)
- return QColor(255, 255, 255, 8);
return buttonColor(palette).lighter(104);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 09:07:03 +0000