aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/controls/Button.qml10
-rw-r--r--src/imports/controls/CheckBox.qml10
-rw-r--r--src/imports/controls/MenuItem.qml2
-rw-r--r--src/imports/controls/RadioButton.qml6
-rw-r--r--src/imports/controls/Switch.qml12
-rw-r--r--src/imports/controls/material/Button.qml4
-rw-r--r--src/imports/controls/material/CheckBox.qml2
-rw-r--r--src/imports/controls/material/ComboBox.qml2
-rw-r--r--src/imports/controls/material/RadioButton.qml2
-rw-r--r--src/imports/controls/material/Slider.qml2
-rw-r--r--src/imports/controls/material/SwipeDelegate.qml2
-rw-r--r--src/imports/controls/material/Switch.qml2
-rw-r--r--src/imports/controls/material/ToolButton.qml2
-rw-r--r--src/imports/controls/universal/ComboBox.qml2
-rw-r--r--src/imports/controls/universal/ItemDelegate.qml4
-rw-r--r--src/imports/controls/universal/MenuItem.qml2
-rw-r--r--src/imports/controls/universal/SwipeDelegate.qml4
17 files changed, 35 insertions, 35 deletions
diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml
index f7f5433c..83f89eb3 100644
--- a/src/imports/controls/Button.qml
+++ b/src/imports/controls/Button.qml
@@ -55,7 +55,7 @@ T.Button {
text: control.text
font: control.font
opacity: enabled || highlighted ? 1 : 0.3
- color: control.checked || control.highlighted ? "#ffffff" : (control.activeFocus ? "#0066ff" : (control.pressed ? "#26282a" : "#353637"))
+ color: control.checked || control.highlighted ? "#ffffff" : (control.activeKeyFocus ? "#0066ff" : (control.pressed ? "#26282a" : "#353637"))
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
elide: Text.ElideRight
@@ -68,10 +68,10 @@ T.Button {
implicitHeight: 40
opacity: enabled ? 1 : (control.checked ? 0.2 : 0.3)
color: control.checked || control.highlighted ?
- (control.activeFocus ? (control.pressed ? "#599bff" : "#0066ff") : (control.pressed ? "#585a5c" : "#353637")) :
- (control.activeFocus ? (control.pressed ? "#cce0ff" : "#f0f6ff") : (control.pressed ? "#d6d6d6" : "#f6f6f6"))
- border.color: control.activeFocus ? "#0066ff" : (control.pressed ? "#26282a" : "#353637")
- border.width: control.checked || control.highlighted ? 0 : (control.activeFocus ? 2 : 1)
+ (control.activeKeyFocus ? (control.pressed ? "#599bff" : "#0066ff") : (control.pressed ? "#585a5c" : "#353637")) :
+ (control.activeKeyFocus ? (control.pressed ? "#cce0ff" : "#f0f6ff") : (control.pressed ? "#d6d6d6" : "#f6f6f6"))
+ border.color: control.activeKeyFocus ? "#0066ff" : (control.pressed ? "#26282a" : "#353637")
+ border.width: control.checked || control.highlighted ? 0 : (control.activeKeyFocus ? 2 : 1)
}
//! [background]
}
diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/CheckBox.qml
index b12374f0..f6f62ed3 100644
--- a/src/imports/controls/CheckBox.qml
+++ b/src/imports/controls/CheckBox.qml
@@ -58,14 +58,14 @@ T.CheckBox {
x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2
y: control.topPadding + (control.availableHeight - height) / 2
- color: control.enabled ? (control.pressed ? (control.activeFocus ? "#cce0ff" : "#e4e4e4") : "#f6f6f6") : "#353637"
- border.width: control.activeFocus ? 2 : 1
- border.color: control.enabled ? (control.activeFocus ? "#0066ff" : (control.pressed ? "#26282a" : "#353637")) : "transparent"
+ color: control.enabled ? (control.pressed ? (control.activeKeyFocus ? "#cce0ff" : "#e4e4e4") : "#f6f6f6") : "#353637"
+ border.width: control.activeKeyFocus ? 2 : 1
+ border.color: control.enabled ? (control.activeKeyFocus ? "#0066ff" : (control.pressed ? "#26282a" : "#353637")) : "transparent"
Image {
x: (parent.width - width) / 2
y: (parent.height - height) / 2
- source: "qrc:/qt-project.org/imports/Qt/labs/controls/images/check" + (control.activeFocus ? "-focus.png" : ".png")
+ source: "qrc:/qt-project.org/imports/Qt/labs/controls/images/check" + (control.activeKeyFocus ? "-focus.png" : ".png")
visible: control.checkState === Qt.Checked
}
@@ -74,7 +74,7 @@ T.CheckBox {
y: (parent.height - height) / 2
width: 16
height: 3
- color: control.activeFocus ? "#0066ff" : "#353637"
+ color: control.activeKeyFocus ? "#0066ff" : "#353637"
visible: control.checkState === Qt.PartiallyChecked
}
}
diff --git a/src/imports/controls/MenuItem.qml b/src/imports/controls/MenuItem.qml
index 75866fbe..d7d9ce64 100644
--- a/src/imports/controls/MenuItem.qml
+++ b/src/imports/controls/MenuItem.qml
@@ -84,7 +84,7 @@ T.MenuItem {
y: 1
width: parent.width - 2
height: parent.height - 2
- color: control.activeFocus || control.pressed ? "#eeeeee" : "transparent"
+ color: control.activeKeyFocus || control.pressed ? "#eeeeee" : "transparent"
}
}
//! [background]
diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/RadioButton.qml
index fb5bd70a..1c4966e5 100644
--- a/src/imports/controls/RadioButton.qml
+++ b/src/imports/controls/RadioButton.qml
@@ -60,9 +60,9 @@ T.RadioButton {
y: control.topPadding + (control.availableHeight - height) / 2
radius: width / 2
- color: control.pressed ? (control.activeFocus ? "#cce0ff" : "#e4e4e4") : "#f6f6f6"
- border.width: control.activeFocus ? 2 : 1
- border.color: control.activeFocus ? "#0066ff" : (control.pressed ? "#26282a" : "#353637")
+ color: control.pressed ? (control.activeKeyFocus ? "#cce0ff" : "#e4e4e4") : "#f6f6f6"
+ border.width: control.activeKeyFocus ? 2 : 1
+ border.color: control.activeKeyFocus ? "#0066ff" : (control.pressed ? "#26282a" : "#353637")
Rectangle {
x: (parent.width - width) / 2
diff --git a/src/imports/controls/Switch.qml b/src/imports/controls/Switch.qml
index b06d91fd..cf9c0361 100644
--- a/src/imports/controls/Switch.qml
+++ b/src/imports/controls/Switch.qml
@@ -62,9 +62,9 @@ T.Switch {
width: 56
height: 16
radius: 8
- color: control.checked ? (control.activeFocus ? "#0066ff" : "#353637") : "transparent"
- border.width: control.activeFocus ? 2 : 1
- border.color: control.checked ? "transparent" : (control.activeFocus ? "#0066ff" : "#353637")
+ color: control.checked ? (control.activeKeyFocus ? "#0066ff" : "#353637") : "transparent"
+ border.width: control.activeKeyFocus ? 2 : 1
+ border.color: control.checked ? "transparent" : (control.activeKeyFocus ? "#0066ff" : "#353637")
}
Rectangle {
@@ -73,9 +73,9 @@ T.Switch {
width: 28
height: 28
radius: 16
- color: control.pressed ? (control.activeFocus ? "#cce0ff" : "#e4e4e4") : (control.activeFocus ? "#f0f6ff" : "#f6f6f6")
- border.width: control.activeFocus ? 2 : 1
- border.color: control.activeFocus ? "#0066ff" : (control.pressed ? "#26282a" : "#353637")
+ color: control.pressed ? (control.activeKeyFocus ? "#cce0ff" : "#e4e4e4") : (control.activeKeyFocus ? "#f0f6ff" : "#f6f6f6")
+ border.width: control.activeKeyFocus ? 2 : 1
+ border.color: control.activeKeyFocus ? "#0066ff" : (control.pressed ? "#26282a" : "#353637")
Behavior on x {
enabled: !control.pressed
diff --git a/src/imports/controls/material/Button.qml b/src/imports/controls/material/Button.qml
index 4dc9bfc5..ef72b8db 100644
--- a/src/imports/controls/material/Button.qml
+++ b/src/imports/controls/material/Button.qml
@@ -77,7 +77,7 @@ T.Button {
radius: 2
color: !control.enabled ? (control.highlighted ? control.Material.raisedHighlightedButtonDisabledColor : control.Material.raisedButtonDisabledColor) :
(control.pressed ? (control.highlighted ? control.Material.raisedHighlightedButtonPressColor : control.Material.raisedButtonPressColor) :
- (control.activeFocus ? (control.highlighted ? control.Material.raisedHighlightedButtonHoverColor : control.Material.raisedButtonHoverColor) :
+ (control.activeKeyFocus ? (control.highlighted ? control.Material.raisedHighlightedButtonHoverColor : control.Material.raisedButtonHoverColor) :
(control.highlighted ? control.Material.raisedHighlightedButtonColor : control.Material.raisedButtonColor)))
Behavior on color {
@@ -90,7 +90,7 @@ T.Button {
width: parent.width
height: parent.height
radius: parent.radius
- visible: control.activeFocus
+ visible: control.activeKeyFocus
color: control.Material.checkBoxUncheckedRippleColor
}
diff --git a/src/imports/controls/material/CheckBox.qml b/src/imports/controls/material/CheckBox.qml
index fd6ef256..37a06200 100644
--- a/src/imports/controls/material/CheckBox.qml
+++ b/src/imports/controls/material/CheckBox.qml
@@ -86,7 +86,7 @@ T.CheckBox {
height: width
control: control
colored: control.checked
- opacity: control.pressed || control.activeFocus ? 1 : 0
+ opacity: control.pressed || control.activeKeyFocus ? 1 : 0
}
// TODO: This needs to be transparent
diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml
index 46c25b52..efd5afb6 100644
--- a/src/imports/controls/material/ComboBox.qml
+++ b/src/imports/controls/material/ComboBox.qml
@@ -107,7 +107,7 @@ T.ComboBox {
width: parent.width
height: parent.height
radius: parent.radius
- visible: control.activeFocus
+ visible: control.activeKeyFocus
color: control.Material.checkBoxUncheckedRippleColor
}
}
diff --git a/src/imports/controls/material/RadioButton.qml b/src/imports/controls/material/RadioButton.qml
index 4c8831a5..83dbcefa 100644
--- a/src/imports/controls/material/RadioButton.qml
+++ b/src/imports/controls/material/RadioButton.qml
@@ -71,7 +71,7 @@ T.RadioButton {
height: width
control: control
colored: control.checked
- opacity: control.pressed || control.activeFocus ? 1 : 0
+ opacity: control.pressed || control.activeKeyFocus ? 1 : 0
}
Rectangle {
diff --git a/src/imports/controls/material/Slider.qml b/src/imports/controls/material/Slider.qml
index 18f8ed6e..76752206 100644
--- a/src/imports/controls/material/Slider.qml
+++ b/src/imports/controls/material/Slider.qml
@@ -56,7 +56,7 @@ T.Slider {
x: control.leftPadding + (horizontal ? control.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2)
y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : control.visualPosition * (control.availableHeight - height))
value: control.value
- handleHasFocus: control.activeFocus
+ handleHasFocus: control.activeKeyFocus
handlePressed: control.pressed
}
//! [handle]
diff --git a/src/imports/controls/material/SwipeDelegate.qml b/src/imports/controls/material/SwipeDelegate.qml
index 600eb480..34d546d7 100644
--- a/src/imports/controls/material/SwipeDelegate.qml
+++ b/src/imports/controls/material/SwipeDelegate.qml
@@ -154,7 +154,7 @@ T.SwipeDelegate {
background: Rectangle {
color: !control.enabled ? control.Material.swipeDelegateDisabledColor :
(control.pressed ? control.Material.swipeDelegatePressColor :
- (control.activeFocus || control.hovered ? control.Material.swipeDelegateHoverColor : control.Material.swipeDelegateColor))
+ (control.activeKeyFocus || control.hovered ? control.Material.swipeDelegateHoverColor : control.Material.swipeDelegateColor))
Behavior on x {
enabled: !control.pressed
diff --git a/src/imports/controls/material/Switch.qml b/src/imports/controls/material/Switch.qml
index ca4b1ff6..2ff71644 100644
--- a/src/imports/controls/material/Switch.qml
+++ b/src/imports/controls/material/Switch.qml
@@ -67,7 +67,7 @@ T.Switch {
height: width
control: control
colored: control.checked
- opacity: control.pressed || control.activeFocus ? 1 : 0
+ opacity: control.pressed || control.activeKeyFocus ? 1 : 0
}
Rectangle {
diff --git a/src/imports/controls/material/ToolButton.qml b/src/imports/controls/material/ToolButton.qml
index 34a745c1..f27b6bcc 100644
--- a/src/imports/controls/material/ToolButton.qml
+++ b/src/imports/controls/material/ToolButton.qml
@@ -66,7 +66,7 @@ T.ToolButton {
implicitHeight: 48
color: control.pressed ? control.Material.flatButtonPressColor : control.Material.flatButtonFocusColor
- visible: control.enabled && (control.pressed || control.activeFocus || control.checked || control.highlighted)
+ visible: control.enabled && (control.pressed || control.activeKeyFocus || control.checked || control.highlighted)
}
//! [background]
}
diff --git a/src/imports/controls/universal/ComboBox.qml b/src/imports/controls/universal/ComboBox.qml
index 9c38ab8d..f1767828 100644
--- a/src/imports/controls/universal/ComboBox.qml
+++ b/src/imports/controls/universal/ComboBox.qml
@@ -93,7 +93,7 @@ T.ComboBox {
width: parent.width - 4
height: parent.height - 4
- visible: control.activeFocus && (control.focusReason === Qt.TabFocusReason || control.focusReason === Qt.BacktabFocusReason)
+ visible: control.activeKeyFocus
color: control.Universal.accent
opacity: control.Universal.theme === Universal.Light ? 0.4 : 0.6
}
diff --git a/src/imports/controls/universal/ItemDelegate.qml b/src/imports/controls/universal/ItemDelegate.qml
index 3296a7cd..d381086d 100644
--- a/src/imports/controls/universal/ItemDelegate.qml
+++ b/src/imports/controls/universal/ItemDelegate.qml
@@ -83,12 +83,12 @@ T.ItemDelegate {
//! [background]
background: Rectangle {
- visible: control.pressed || control.highlighted || control.activeFocus
+ visible: control.pressed || control.highlighted || control.activeKeyFocus
color: control.pressed ? control.Universal.listMediumColor : control.Universal.altMediumLowColor
Rectangle {
width: parent.width
height: parent.height
- visible: control.activeFocus || control.highlighted
+ visible: control.activeKeyFocus || control.highlighted
color: control.Universal.accent
opacity: control.Universal.theme === Universal.Light ? 0.4 : 0.6
}
diff --git a/src/imports/controls/universal/MenuItem.qml b/src/imports/controls/universal/MenuItem.qml
index cc8cb75d..128ef9da 100644
--- a/src/imports/controls/universal/MenuItem.qml
+++ b/src/imports/controls/universal/MenuItem.qml
@@ -92,7 +92,7 @@ T.MenuItem {
width: parent.width - 2
height: parent.height - 2
- visible: control.activeFocus
+ visible: control.activeKeyFocus
color: control.Universal.accent
opacity: control.Universal.theme === Universal.Light ? 0.4 : 0.6
}
diff --git a/src/imports/controls/universal/SwipeDelegate.qml b/src/imports/controls/universal/SwipeDelegate.qml
index 92c3a6dc..7041e18e 100644
--- a/src/imports/controls/universal/SwipeDelegate.qml
+++ b/src/imports/controls/universal/SwipeDelegate.qml
@@ -94,12 +94,12 @@ T.SwipeDelegate {
background: Rectangle {
color: !control.enabled ? control.Universal.chromeDisabledHighColor :
(control.pressed ? control.Universal.chromeHighColor :
- (control.activeFocus || control.hovered ? control.Universal.chromeLowColor : control.Universal.chromeMediumColor))
+ (control.activeKeyFocus || control.hovered ? control.Universal.chromeLowColor : control.Universal.chromeMediumColor))
Rectangle {
width: parent.width
height: parent.height
- visible: control.activeFocus || control.highlighted
+ visible: control.activeKeyFocus || control.highlighted
color: control.Universal.accent
opacity: control.Universal.theme === Universal.Light ? 0.4 : 0.6
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 23:03:23 +0000