From 2230fefbea9c8f7a4bd30ae96fccb4818a2cf357 Mon Sep 17 00:00:00 2001 From: Scharel Clemens Date: Thu, 6 Dec 2018 14:07:48 +0100 Subject: [PATCH] Adopt hightlighted colors for the category tags. --- qml/pages/EditPage.qml | 3 ++- qml/pages/NotePage.qml | 3 ++- qml/pages/NotesPage.qml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/qml/pages/EditPage.qml b/qml/pages/EditPage.qml index 2df0b41..6820e84 100644 --- a/qml/pages/EditPage.qml +++ b/qml/pages/EditPage.qml @@ -93,6 +93,7 @@ Dialog { id: categoryRepeater model: account.categories BackgroundItem { + id: categoryBackground width: categoryRectangle.width height: categoryRectangle.height Rectangle { @@ -106,7 +107,7 @@ Dialog { id: categoryLabel anchors.centerIn: parent text: modelData - color: Theme.primaryColor + color: categoryBackground.highlighted ? Theme.highlightColor : Theme.primaryColor font.pixelSize: Theme.fontSizeSmall } } diff --git a/qml/pages/NotePage.qml b/qml/pages/NotePage.qml index d7c0bfc..e4dcc99 100644 --- a/qml/pages/NotePage.qml +++ b/qml/pages/NotePage.qml @@ -168,6 +168,7 @@ Dialog { id: categoryRepeater model: account.categories BackgroundItem { + id: categoryBackground width: categoryRectangle.width height: categoryRectangle.height Rectangle { @@ -181,7 +182,7 @@ Dialog { id: categoryLabel anchors.centerIn: parent text: modelData - color: Theme.primaryColor + color: categoryBackground.highlighted ? Theme.highlightColor : Theme.primaryColor font.pixelSize: Theme.fontSizeSmall } } diff --git a/qml/pages/NotesPage.qml b/qml/pages/NotesPage.qml index 5f7c1a5..f5f75c2 100644 --- a/qml/pages/NotesPage.qml +++ b/qml/pages/NotesPage.qml @@ -156,7 +156,7 @@ Page { id: categoryLabel anchors.centerIn: parent text: category - color: Theme.secondaryColor + color: note.highlighted ? Theme.secondaryHighlightColor : Theme.secondaryColor font.pixelSize: Theme.fontSizeExtraSmall } }