status-im/status-desktop
2
0
Fork 0
mirror of https://github.com/status-im/status-desktop.git synced 2025-01-10 22:36:24 +00:00
Code Issues Projects Releases Wiki Activity

fix(@desktop/chat): Right click message actions dont work

Browse Source 
Fix the bug introduced by removing MessageContextMenu from Chat column. Added missing logic for edit message via MessageContextMenu

fixes #3223
This commit is contained in:
khushboo-dev-cpp 2021-08-19 15:04:52 +02:00 committed by Iuri Matias
parent d4de0c25a4
commit 82718a0e93
5 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui/app/AppLayouts/Chat/ChatColumn.qml
View File

@ -23,7 +23,6 @@ Item {
id: chatColumnLayout
anchors.fill: parent
property var messageContextMenu
property alias pinnedMessagesPopupComponent: pinnedMessagesPopupComponent
property int chatGroupsListViewCount: 0
property bool isReply: false
@ -341,7 +340,9 @@ Item {
sourceComponent: ChatMessages {
id: chatMessages
messageList: messages
messageContextMenuInst: messageContextMenu
messageContextMenuInst: MessageContextMenu {
reactionModel: EmojiReactions { }
}
Component.onCompleted: {
chatColumnLayout.userList = chatMessages.messageList.userList;
}

1
ui/app/AppLayouts/Chat/ChatColumn/Message.qml
View File

@ -214,6 +214,7 @@ Item {
messageContextMenu.isCurrentUser = isCurrentUser;
messageContextMenu.isRightClickOnImage = isRightClickOnImage
messageContextMenu.imageSource = imageSource
messageContextMenu.onClickEdit = function() {root.isEdit = true}
if (isReply) {
let nickname = appMain.getUserNickname(repliedMessageAuthor)

6
ui/app/AppLayouts/Chat/ChatColumn/UserList.qml
View File

@ -13,13 +13,17 @@ import "../components"
import "./samples/"
import "./MessageComponents"
import "../ContactsColumn"
import "../data"
Item {
id: root
anchors.fill: parent
property var userList
property var currentTime
property var messageContextMenu
property var messageContextMenu: MessageContextMenu {
id: quickActionMessageOptionsMenu
reactionModel: EmojiReactions { }
}
Rectangle {
anchors.fill: parent

8
ui/app/AppLayouts/Chat/ChatLayout.qml
View File

@ -41,7 +41,6 @@ StatusAppThreePanelLayout {
centerPanel: ChatColumn {
id: chatColumn
chatGroupsListViewCount: contactColumnLoader.item.chatGroupsListViewCount
messageContextMenu: quickActionMessageOptionsMenu
}
showRightPanel: chatColumn.showUsers && (chatsModel.channelView.activeChannel.chatType !== Constants.chatTypeOneToOne)
@ -54,7 +53,7 @@ StatusAppThreePanelLayout {
Component {
id: userListComponent
UserList { currentTime: chatColumn.currentTime; userList: chatColumn.userList; messageContextMenu: quickActionMessageOptionsMenu }
UserList { currentTime: chatColumn.currentTime; userList: chatColumn.userList;}
}
Component {
@ -89,11 +88,6 @@ StatusAppThreePanelLayout {
}
}
MessageContextMenu {
id: quickActionMessageOptionsMenu
reactionModel: EmojiReactions { }
}
ConfirmationDialog {
id: removeContactConfirmationDialog
// % "Remove contact"

1
ui/app/AppLayouts/Chat/components/MessageContextMenu.qml
View File

@ -238,7 +238,6 @@ StatusPopupMenu {
} else {
showReplyArea()
}
messageContextMenu.closeParentPopup()
messageContextMenu.close()
}
icon.name: "chat"