From 46b1a246642a0aafbf8032f0bbf7a515daeba103 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Wed, 4 Jul 2018 10:05:17 +0200 Subject: Control disabledTextColor from the delegate as well --- framework/qml/ListDelegate.qml | 1 + framework/qml/MailListView.qml | 2 +- views/log/qml/View.qml | 5 +++-- 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 { property alias color: background.color property alias border: background.border property color textColor: highlighted ? Kube.Colors.highlightedTextColor : Kube.Colors.textColor + property color disabledTextColor: highlighted ? Kube.Colors.highlightedTextColor : Kube.Colors.disabledTextColor height: Kube.Units.gridUnit * 3 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 { visible: !delegateRoot.hovered text: Qt.formatDateTime(model.date, "dd MMM yyyy") font.italic: true - color: !delegateRoot.highlighted ? Kube.Colors.disabledTextColor : delegateRoot.textColor + color: delegateRoot.disabledTextColor font.pointSize: Kube.Units.tinyFontSize } 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 { } delegate: Kube.ListDelegate { + id: delegateRoot border.color: Kube.Colors.buttonColor border.width: 1 Kube.Label { @@ -126,7 +127,7 @@ Controls1.SplitView { width: parent.width - Kube.Units.largeSpacing * 2 maximumLineCount: 1 elide: Text.ElideRight - color: Kube.Colors.disabledTextColor + color: delegateRoot.disabledTextColor text: model.message } @@ -140,7 +141,7 @@ Controls1.SplitView { } text: Qt.formatDateTime(model.timestamp, " hh:mm:ss dd MMM yyyy") font.italic: true - color: Kube.Colors.disabledTextColor + color: delegateRoot.disabledTextColor font.pointSize: Kube.Units.smallFontSize } } -- cgit v1.2.3