Commit 468ab922 authored by Claudio Cambra's avatar Claudio Cambra
Browse files

Filter header pulls color for task collection title straight from collection,...

Filter header pulls color for task collection title straight from collection, avoiding situation where a particularly dark collection colour could make the filter title white
parent 65b4e72b
Pipeline #96412 canceled with stage
...@@ -42,7 +42,7 @@ RowLayout { ...@@ -42,7 +42,7 @@ RowLayout {
headerLayout.filterCollectionDetails.displayName : i18n("All Tasks") headerLayout.filterCollectionDetails.displayName : i18n("All Tasks")
font.weight: !headerLayout.todoMode ? Font.Normal : Font.Bold font.weight: !headerLayout.todoMode ? Font.Normal : Font.Bold
color: headerLayout.todoMode && headerLayout.filterCollectionDetails && headerLayout.filter.collectionId > -1 ? color: headerLayout.todoMode && headerLayout.filterCollectionDetails && headerLayout.filter.collectionId > -1 ?
LabelUtils.getIncidenceLabelColor(headerLayout.filterCollectionDetails.color, headerLayout.isDark) : Kirigami.Theme.textColor headerLayout.filterCollectionDetails.color : Kirigami.Theme.textColor
elide: Text.ElideRight elide: Text.ElideRight
level: headerLayout.todoMode ? 1 : 2 level: headerLayout.todoMode ? 1 : 2
} }
...@@ -87,7 +87,7 @@ RowLayout { ...@@ -87,7 +87,7 @@ RowLayout {
tagFlow.width : itemLayout.implicitWidth tagFlow.width : itemLayout.implicitWidth
isHeading: true isHeading: true
headingItem.color: headerLayout.todoMode && headerLayout.filterCollectionDetails ? headingItem.color: headerLayout.todoMode && headerLayout.filterCollectionDetails ?
LabelUtils.getIncidenceLabelColor(headerLayout.filterCollectionDetails.color, headerLayout.isDark) : Kirigami.Theme.textColor headerLayout.filterCollectionDetails.color : Kirigami.Theme.textColor
icon.name: "edit-delete-remove" icon.name: "edit-delete-remove"
onClicked: headerLayout.removeFilterTag(modelData) onClicked: headerLayout.removeFilterTag(modelData)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment