diff options
| author | Camila <hello@camila.codes> | 2022-09-20 21:50:12 +0300 |
|---|---|---|
| committer | Camila (Rebase PR Action) <hello@camila.codes> | 2022-09-27 17:49:29 +0300 |
| commit | f3513aaafe85e9787c28c9158ed86cabfae6b890 (patch) | |
| tree | d594601d36aa7ea672fb58d68f9d41b47ef8d4f7 | |
| parent | 1f5ce39e6c220975bc46e4f78a2a6405027d0a09 (diff) | |
Fix two factor auth notification: 'Approve' link is a primary action.
Signed-off-by: Camila <hello@camila.codes>
| -rw-r--r-- | src/gui/tray/ActivityActionButton.qml | 6 | ||||
| -rw-r--r-- | src/gui/tray/ActivityItemActions.qml | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/gui/tray/ActivityActionButton.qml b/src/gui/tray/ActivityActionButton.qml index eca55ebdc..53ae3f40a 100644 --- a/src/gui/tray/ActivityActionButton.qml +++ b/src/gui/tray/ActivityActionButton.qml @@ -18,10 +18,12 @@ Item { property color textColor: Style.ncTextColor property color textColorHovered: Style.ncSecondaryTextColor + property bool primaryButton: false + signal clicked() Loader { - active: root.imageSource === "" + active: root.imageSource === "" && !primaryButton anchors.fill: parent @@ -38,7 +40,7 @@ Item { } Loader { - active: root.imageSource !== "" + active: root.imageSource !== "" || primaryButton anchors.fill: parent diff --git a/src/gui/tray/ActivityItemActions.qml b/src/gui/tray/ActivityItemActions.qml index 6d9da4182..40934fea6 100644 --- a/src/gui/tray/ActivityItemActions.qml +++ b/src/gui/tray/ActivityItemActions.qml @@ -34,7 +34,7 @@ RowLayout { id: activityActionButton readonly property string verb: model.modelData.verb - readonly property bool primary: model.index === 0 && verb !== "DELETE" + readonly property bool primary: (model.index === 0 && verb !== "DELETE") || model.modelData.primary readonly property bool isTalkReplyButton: verb === "REPLY" Layout.minimumWidth: primary ? Style.activityItemActionPrimaryButtonMinWidth : Style.activityItemActionSecondaryButtonMinWidth @@ -46,10 +46,11 @@ RowLayout { imageSource: model.modelData.imageSource ? model.modelData.imageSource + root.adjustedHeaderColor : "" imageSourceHover: model.modelData.imageSourceHovered ? model.modelData.imageSourceHovered + UserModel.currentUser.headerTextColor : "" - textColor: imageSource !== "" ? root.adjustedHeaderColor : Style.ncTextColor - textColorHovered: imageSource !== "" ? UserModel.currentUser.headerTextColor : Style.ncTextColor + textColor: imageSource !== "" || primary ? root.adjustedHeaderColor : Style.ncTextColor + textColorHovered: imageSource !== "" || primary ? UserModel.currentUser.headerTextColor : Style.ncTextColor bold: primary + primaryButton: primary onClicked: !isTalkReplyButton ? root.triggerAction(model.index) : root.showReplyField() } |