From d986b47a21152e258c1faf9506d43dee78ad25ee Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Thu, 8 Jun 2023 19:26:59 +0800 Subject: [PATCH] Fix reply button visibility after reply field opened and reply text sent Signed-off-by: Claudio Cambra --- src/gui/tray/ActivityItemActions.qml | 4 ++++ src/gui/tray/ActivityItemContent.qml | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/gui/tray/ActivityItemActions.qml b/src/gui/tray/ActivityItemActions.qml index 3cbb7920bf..a44fc9880e 100644 --- a/src/gui/tray/ActivityItemActions.qml +++ b/src/gui/tray/ActivityItemActions.qml @@ -19,6 +19,8 @@ Repeater { property Flickable flickable + property bool talkReplyButtonVisible: true + signal triggerAction(int actionIndex) signal showReplyField() @@ -46,5 +48,7 @@ Repeater { textColorHovered: Style.currentUserHeaderTextColor contentsFont.bold: true bgColor: Style.currentUserHeaderColor + + visible: verb !== "REPLY" || (verb === "REPLY" && root.talkReplyButtonVisible) } } diff --git a/src/gui/tray/ActivityItemContent.qml b/src/gui/tray/ActivityItemContent.qml index b5a55f7c60..795a490d91 100644 --- a/src/gui/tray/ActivityItemContent.qml +++ b/src/gui/tray/ActivityItemContent.qml @@ -256,7 +256,7 @@ RowLayout { ActivityItemActions { id: activityActions - visible: !isFileActivityList && activityData.linksForActionButtons.length > 0 && !isTalkReplyOptionVisible + visible: !isFileActivityList && activityData.linksForActionButtons.length > 0 Layout.fillWidth: true Layout.leftMargin: Style.trayListItemIconSize + Style.trayHorizontalMargin @@ -273,6 +273,7 @@ RowLayout { onTriggerAction: activityModel.slotTriggerAction(activityData.activityIndex, actionIndex) onShowReplyField: isTalkReplyOptionVisible = true + talkReplyButtonVisible: root.activityData.messageSent === "" && !isTalkReplyOptionVisible } } }