status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat(edit): enable editing the message in an image message 

Fixes #13255

It seems like all our code already supported it, we just blocked it in QML just in case 🤷
This commit is contained in:
Jonathan Rainville 2024-04-18 14:33:00 -04:00
parent 5f980a1a8f
commit 1da3c26da1
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ui/StatusQ/src/StatusQ/Components/StatusMessage.qml
View File

@ -303,6 +303,7 @@ Control {
visible: active visible: active
sourceComponent: StatusTextMessage { sourceComponent: StatusTextMessage {
messageDetails: root.messageDetails messageDetails: root.messageDetails
isEdited: root.isEdited
allowShowMore: !root.isInPinnedPopup allowShowMore: !root.isInPinnedPopup
textField.anchors.rightMargin: root.isInPinnedPopup ? /*Style.current.xlPadding*/ 32 : 0 // margin for the "Unpin" floating button textField.anchors.rightMargin: root.isInPinnedPopup ? /*Style.current.xlPadding*/ 32 : 0 // margin for the "Unpin" floating button
highlightedLink: root.highlightedLink highlightedLink: root.highlightedLink

5
ui/imports/shared/views/chat/MessageView.qml
View File

@ -114,6 +114,7 @@ Loader {
property double nextMessageTimestamp: nextMessageAsJsonObj ? nextMessageAsJsonObj.timestamp : 0 property double nextMessageTimestamp: nextMessageAsJsonObj ? nextMessageAsJsonObj.timestamp : 0
property var nextMessageAsJsonObj property var nextMessageAsJsonObj
readonly property bool editRestricted: root.isSticker
property bool editModeOn: false property bool editModeOn: false
property bool isEdited: false property bool isEdited: false
@ -178,7 +179,7 @@ Loader {
messageContentType: root.messageContentType, messageContentType: root.messageContentType,
pinnedMessage: root.pinnedMessage, pinnedMessage: root.pinnedMessage,
canPin: !!root.messageStore && root.messageStore.getNumberOfPinnedMessages() < Constants.maxNumberOfPins, canPin: !!root.messageStore && root.messageStore.getNumberOfPinnedMessages() < Constants.maxNumberOfPins,
editRestricted: root.isSticker || root.isImage, editRestricted: root.editRestricted,
} }
Global.openMenu(messageContextMenuComponent, this, params) Global.openMenu(messageContextMenuComponent, this, params)
@ -946,7 +947,7 @@ Loader {
} }
}, },
Loader { Loader {
active: !root.isInPinnedPopup && root.isText && !root.editModeOn && root.amISender && delegate.hovered && !delegate.hideQuickActions active: !root.isInPinnedPopup && !root.editRestricted && !root.editModeOn && root.amISender && delegate.hovered && !delegate.hideQuickActions
&& !root.isViewMemberMessagesePopup && root.rootStore.permissionsStore.viewAndPostCriteriaMet && !root.isViewMemberMessagesePopup && root.rootStore.permissionsStore.viewAndPostCriteriaMet
visible: active visible: active
sourceComponent: StatusFlatRoundButton { sourceComponent: StatusFlatRoundButton {