Change in plasma-framework[master]: Use the same text colour for comboboxes as buttons
David Edmundson (Code Review)
noreply at kde.org
Thu Dec 11 14:07:02 UTC 2014
David Edmundson has uploaded a new change for review.
https://gerrit.vesnicky.cesnet.cz/r/219
Change subject: Use the same text colour for comboboxes as buttons
......................................................................
Use the same text colour for comboboxes as buttons
Given comboboxes use the same background as buttons they should use the
same text colour too.
This prevents a situation in Breeze where a ComboBox could get white
text on a white background when using a colourscope with complementary
colours.
Change-Id: I21502186178a32ce480cd3e838335451bf644c3e
---
M src/declarativeimports/plasmastyle/ComboBoxStyle.qml
A tests/components/combobox.qml
2 files changed, 42 insertions(+), 0 deletions(-)
git pull ssh://gerrit.vesnicky.cesnet.cz:29418/plasma-framework refs/changes/19/219/1
diff --git a/src/declarativeimports/plasmastyle/ComboBoxStyle.qml b/src/declarativeimports/plasmastyle/ComboBoxStyle.qml
index e73d0da..501efed 100644
--- a/src/declarativeimports/plasmastyle/ComboBoxStyle.qml
+++ b/src/declarativeimports/plasmastyle/ComboBoxStyle.qml
@@ -31,6 +31,7 @@
label: PlasmaComponents.Label {
text: control.currentText
elide: Text.ElideRight
+ color: theme.buttonTextColor
verticalAlignment: Text.AlignTop
}
diff --git a/tests/components/combobox.qml b/tests/components/combobox.qml
new file mode 100644
index 0000000..76510f3
--- /dev/null
+++ b/tests/components/combobox.qml
@@ -0,0 +1,41 @@
+import QtQuick 2.0
+
+import org.kde.plasma.components 2.0
+import org.kde.plasma.core 2.0 as PlasmaCore
+
+Rectangle {
+ id: root
+ color: "white"
+ width: 800
+ height: 300
+
+ ListModel {
+ id: demoModel
+ ListElement { text: "Banana"; color: "Yellow" }
+ ListElement { text: "Apple"; color: "Green" }
+ ListElement { text: "Coconut"; color: "Brown" }
+ }
+
+ Flow {
+ anchors.fill: parent
+ anchors.margins: 20
+ spacing: 20
+
+ ComboBox {
+ model:demoModel
+ }
+ ComboBox {
+ editable: true
+ model: demoModel
+ }
+ PlasmaCore.ColorScope {
+ implicitWidth: childrenRect.width
+ implicitHeight: childrenRect.width
+
+ colorGroup: PlasmaCore.Theme.ComplementaryColorGroup
+ ComboBox {
+ model:demoModel
+ }
+ }
+ }
+}
\ No newline at end of file
--
To view, visit https://gerrit.vesnicky.cesnet.cz/r/219
To unsubscribe, visit https://gerrit.vesnicky.cesnet.cz/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I21502186178a32ce480cd3e838335451bf644c3e
Gerrit-PatchSet: 1
Gerrit-Project: plasma-framework
Gerrit-Branch: master
Gerrit-Owner: David Edmundson <david at davidedmundson.co.uk>
More information about the Plasma-devel
mailing list