From ea05c8ecc76062994ba3a88f667b18a0c04f7d47 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Tue, 15 Aug 2023 15:10:41 +0800 Subject: [PATCH] Colour coloured elements in share view with user accent colour Signed-off-by: Claudio Cambra --- src/gui/filedetails/FileDetailsPage.qml | 1 + src/gui/filedetails/ShareDelegate.qml | 3 ++- src/gui/filedetails/ShareView.qml | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gui/filedetails/FileDetailsPage.qml b/src/gui/filedetails/FileDetailsPage.qml index 45f871414..5008017a8 100644 --- a/src/gui/filedetails/FileDetailsPage.qml +++ b/src/gui/filedetails/FileDetailsPage.qml @@ -285,6 +285,7 @@ Page { iconSize: root.iconSize rootStackView: root.rootStackView backgroundsVisible: root.backgroundsVisible + accentColor: root.accentColor } } } diff --git a/src/gui/filedetails/ShareDelegate.qml b/src/gui/filedetails/ShareDelegate.qml index 0974c92d5..97821f4dd 100644 --- a/src/gui/filedetails/ShareDelegate.qml +++ b/src/gui/filedetails/ShareDelegate.qml @@ -50,6 +50,7 @@ GridLayout { property FileDetails fileDetails: FileDetails {} property StackView rootStackView: StackView {} property bool backgroundsVisible: true + property color accentColor: Style.ncBlue property bool canCreateLinkShares: true property bool serverAllowsResharing: true @@ -89,7 +90,7 @@ GridLayout { id: backgroundOrMask anchors.fill: parent radius: width / 2 - color: Style.ncBlue + color: root.accentColor visible: !imageItem.isAvatar } diff --git a/src/gui/filedetails/ShareView.qml b/src/gui/filedetails/ShareView.qml index d07cbcd92..b130b6802 100644 --- a/src/gui/filedetails/ShareView.qml +++ b/src/gui/filedetails/ShareView.qml @@ -31,6 +31,7 @@ ColumnLayout { property int horizontalPadding: 0 property int iconSize: 32 property bool backgroundsVisible: true + property color accentColor: Style.ncBlue readonly property bool sharingPossible: shareModel && shareModel.canShare && shareModel.sharingEnabled readonly property bool userGroupSharingPossible: sharingPossible && shareModel.userGroupSharingEnabled @@ -216,6 +217,7 @@ ColumnLayout { fileDetails: root.fileDetails rootStackView: root.rootStackView backgroundsVisible: root.backgroundsVisible + accentColor: root.accentColor canCreateLinkShares: root.publicLinkSharingPossible serverAllowsResharing: root.serverAllowsResharing -- 2.30.2