yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

Other: Fix activeFocus color for components

Browse Source
This commit is contained in:
Alexander Bilyak
2021-10-27 11:48:04 +02:00
committed by Jakub
parent 36ec9b07e0
commit 8c9d5c54fc
6 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
internal/frontend/qml/Proton/ComboBox.qml
View File

@ -71,7 +71,7 @@ T.ComboBox {
return root.colorScheme.interaction_norm
}
if (root.hovered) {
if (root.hovered || root.activeFocus) {
return root.colorScheme.field_hover
}
@ -91,7 +91,7 @@ T.ComboBox {
return root.colorScheme.interaction_default_active
}
if (root.enabled && root.hovered) {
if (root.enabled && root.hovered || root.activeFocus) {
return root.colorScheme.interaction_default_hover
}
@ -121,14 +121,25 @@ T.ComboBox {
width: parent.width
text: root.textRole ? (Array.isArray(root.model) ? modelData[root.textRole] : model[root.textRole]) : modelData
palette.text: root.enabled ? root.colorScheme.text_norm : root.colorScheme.text_disabled
palette.text: {
if (!root.enabled) {
return root.colorScheme.text_disabled
}
if (selected) {
return root.colorScheme.text_invert
}
return root.colorScheme.text_norm
}
font: root.font
hoverEnabled: root.hoverEnabled
// we use highlighted to indicate currently selected delegate
highlighted: root.currentIndex === index
palette.highlightedText: root.enabled ? root.colorScheme.text_invert : root.colorScheme.text_disabled
property bool selected: root.currentIndex === index
highlighted: root.highlightedIndex === index
palette.highlightedText: selected ? root.colorScheme.text_invert : root.colorScheme.text_norm
background: PaddedRectangle {
radius: 4
@ -137,11 +148,11 @@ T.ComboBox {
return root.colorScheme.interaction_default_active
}
if (parent.highlighted) {
if (parent.selected) {
return root.colorScheme.interaction_norm
}
if (parent.hovered) {
if (parent.hovered || parent.highlighted) {
return root.colorScheme.interaction_default_hover
}