summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2018-07-04 10:05:17 +0200
committerChristian Mollekopf <chrigi_1@fastmail.fm>2018-07-04 10:05:17 +0200
commit46b1a246642a0aafbf8032f0bbf7a515daeba103 (patch)
treed3cd3a4d7a0be0be84675a40c24c5d3729fe4db8
parenta69789502feb0235bddad0cf3cb9ed9ca7554632 (diff)
downloadkube-46b1a246642a0aafbf8032f0bbf7a515daeba103.tar.gz
kube-46b1a246642a0aafbf8032f0bbf7a515daeba103.zip
Control disabledTextColor from the delegate as well
-rw-r--r--framework/qml/ListDelegate.qml1
-rw-r--r--framework/qml/MailListView.qml2
-rw-r--r--views/log/qml/View.qml5
3 files changed, 5 insertions, 3 deletions
diff --git a/framework/qml/ListDelegate.qml b/framework/qml/ListDelegate.qml
index 6d6a5d08..196148cb 100644
--- a/framework/qml/ListDelegate.qml
+++ b/framework/qml/ListDelegate.qml
@@ -27,6 +27,7 @@ T.ItemDelegate {
27 property alias color: background.color 27 property alias color: background.color
28 property alias border: background.border 28 property alias border: background.border
29 property color textColor: highlighted ? Kube.Colors.highlightedTextColor : Kube.Colors.textColor 29 property color textColor: highlighted ? Kube.Colors.highlightedTextColor : Kube.Colors.textColor
30 property color disabledTextColor: highlighted ? Kube.Colors.highlightedTextColor : Kube.Colors.disabledTextColor
30 31
31 height: Kube.Units.gridUnit * 3 32 height: Kube.Units.gridUnit * 3
32 width: root.ListView.view.width 33 width: root.ListView.view.width
diff --git a/framework/qml/MailListView.qml b/framework/qml/MailListView.qml
index 90f3013b..55c229db 100644
--- a/framework/qml/MailListView.qml
+++ b/framework/qml/MailListView.qml
@@ -251,7 +251,7 @@ FocusScope {
251 visible: !delegateRoot.hovered 251 visible: !delegateRoot.hovered
252 text: Qt.formatDateTime(model.date, "dd MMM yyyy") 252 text: Qt.formatDateTime(model.date, "dd MMM yyyy")
253 font.italic: true 253 font.italic: true
254 color: !delegateRoot.highlighted ? Kube.Colors.disabledTextColor : delegateRoot.textColor 254 color: delegateRoot.disabledTextColor
255 font.pointSize: Kube.Units.tinyFontSize 255 font.pointSize: Kube.Units.tinyFontSize
256 } 256 }
257 257
diff --git a/views/log/qml/View.qml b/views/log/qml/View.qml
index b710267d..560a4cff 100644
--- a/views/log/qml/View.qml
+++ b/views/log/qml/View.qml
@@ -99,6 +99,7 @@ Controls1.SplitView {
99 } 99 }
100 100
101 delegate: Kube.ListDelegate { 101 delegate: Kube.ListDelegate {
102 id: delegateRoot
102 border.color: Kube.Colors.buttonColor 103 border.color: Kube.Colors.buttonColor
103 border.width: 1 104 border.width: 1
104 Kube.Label { 105 Kube.Label {
@@ -126,7 +127,7 @@ Controls1.SplitView {
126 width: parent.width - Kube.Units.largeSpacing * 2 127 width: parent.width - Kube.Units.largeSpacing * 2
127 maximumLineCount: 1 128 maximumLineCount: 1
128 elide: Text.ElideRight 129 elide: Text.ElideRight
129 color: Kube.Colors.disabledTextColor 130 color: delegateRoot.disabledTextColor
130 text: model.message 131 text: model.message
131 } 132 }
132 133
@@ -140,7 +141,7 @@ Controls1.SplitView {
140 } 141 }
141 text: Qt.formatDateTime(model.timestamp, " hh:mm:ss dd MMM yyyy") 142 text: Qt.formatDateTime(model.timestamp, " hh:mm:ss dd MMM yyyy")
142 font.italic: true 143 font.italic: true
143 color: Kube.Colors.disabledTextColor 144 color: delegateRoot.disabledTextColor
144 font.pointSize: Kube.Units.smallFontSize 145 font.pointSize: Kube.Units.smallFontSize
145 } 146 }
146 } 147 }