aboutsummaryrefslogtreecommitdiffstats
path: root/src/quickcontrols/basic
diff options
context:
space:
mode:
authorMitch Curtis <[email protected]>2024-05-06 15:38:53 +0800
committerMitch Curtis <[email protected]>2024-05-08 09:04:50 +0800
commit0ad15c4101889a22bf9ff761e7d20ec515f46514 (patch)
tree45f543c83abed10b99216eefb9ca3286f1f6ec1a /src/quickcontrols/basic
parent8d0b55e988a38d0f1125d677b356fefaf743d2a3 (diff)
ComboBox: fix popup palette inheritance
54a2a35f17d5e5d1793af63b76993a583e10ab41 fixed the theme/accent/primary inheritance of the Material and Universal style's ComboBox popups. This patch makes an equivalent fix for styles that use palettes. Now the Basic and Fusion ComboBox popups will have the correct colors in both light and dark modes. Fixes: QTBUG-124474 Pick-to: 6.5 6.7 Change-Id: I3e3fcdc9d6fe75f195cc4f4707eac6d30413121f Reviewed-by: Richard Moe Gustavsen <[email protected]>
Diffstat (limited to 'src/quickcontrols/basic')
-rw-r--r--src/quickcontrols/basic/ComboBox.qml5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/quickcontrols/basic/ComboBox.qml b/src/quickcontrols/basic/ComboBox.qml
index 5c71a4398e..7c272a80e8 100644
--- a/src/quickcontrols/basic/ComboBox.qml
+++ b/src/quickcontrols/basic/ComboBox.qml
@@ -85,6 +85,7 @@ T.ComboBox {
height: Math.min(contentItem.implicitHeight, control.Window.height - topMargin - bottomMargin)
topMargin: 6
bottomMargin: 6
+ palette: control.palette
contentItem: ListView {
clip: true
@@ -98,14 +99,14 @@ T.ComboBox {
width: parent.width
height: parent.height
color: "transparent"
- border.color: control.palette.mid
+ border.color: palette.mid
}
T.ScrollIndicator.vertical: ScrollIndicator { }
}
background: Rectangle {
- color: control.palette.window
+ color: palette.window
}
}
}