ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify event context menu open

Browse Source 
There's no reason to pass the author from QML to C++, we can query the author in the backend
This commit is contained in:
Tobias Fella
2025-08-29 15:17:19 +02:00
parent 003ab4f278
commit 889bf9cbc6
8 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/qml/NeochatMaximizeComponent.qml
View File

@@ -120,7 +120,7 @@ Components.AlbumMaximizeComponent {
onOpened: forceActiveFocus() onOpened: forceActiveFocus()
onItemRightClicked: RoomManager.viewEventMenu(root.currentEventId, root.currentRoom, root.currentAuthor) onItemRightClicked: RoomManager.viewEventMenu(root.currentEventId, root.currentRoom)
onSaveItem: { onSaveItem: {
var dialog = saveAsDialog.createObject(QQC2.Overlay.overlay); var dialog = saveAsDialog.createObject(QQC2.Overlay.overlay);

4
src/app/roommanager.cpp
View File

@@ -266,7 +266,7 @@ void RoomManager::viewEventSource(const QString &eventId)
Q_EMIT showEventSource(eventId); Q_EMIT showEventSource(eventId);
} }
void RoomManager::viewEventMenu(const QString &eventId, NeoChatRoom *room, NeochatRoomMember *sender, const QString &selectedText, const QString &hoveredLink) void RoomManager::viewEventMenu(const QString &eventId, NeoChatRoom *room, const QString &selectedText, const QString &hoveredLink)
{ {
if (eventId.isEmpty()) { if (eventId.isEmpty()) {
qWarning() << "Tried to open event menu with empty event id"; qWarning() << "Tried to open event menu with empty event id";
@@ -280,7 +280,7 @@ void RoomManager::viewEventMenu(const QString &eventId, NeoChatRoom *room, Neoch
} }
const auto &event = **it; const auto &event = **it;
Q_EMIT showDelegateMenu(eventId, Q_EMIT showDelegateMenu(eventId,
sender, room->qmlSafeMember(event.senderId()),
MessageComponentType::typeForEvent(event), MessageComponentType::typeForEvent(event),
EventHandler::plainBody(room, &event), EventHandler::plainBody(room, &event),
EventHandler::richBody(room, &event), EventHandler::richBody(room, &event),

3
src/app/roommanager.h
View File

@@ -222,8 +222,7 @@ public:
/** /**
* @brief Show a context menu for the given event. * @brief Show a context menu for the given event.
*/ */
Q_INVOKABLE void Q_INVOKABLE void viewEventMenu(const QString &eventId, NeoChatRoom *room, const QString &selectedText = {}, const QString &hoveredLink = {});
viewEventMenu(const QString &eventId, NeoChatRoom *room, NeochatRoomMember *sender, const QString &selectedText = {}, const QString &hoveredLink = {});
/** /**
* @brief Set a URL to be loaded as the initial room. * @brief Set a URL to be loaded as the initial room.

2
src/messagecontent/CodeComponent.qml
View File

@@ -129,7 +129,7 @@ QQC2.Control {
TapHandler { TapHandler {
acceptedDevices: PointerDevice.TouchScreen acceptedDevices: PointerDevice.TouchScreen
onLongPressed: RoomManager.viewEventMenu(root.eventId, root.Message.room, root.author, root.Message.selectedText, root.Message.hoveredLink); onLongPressed: RoomManager.viewEventMenu(root.eventId, root.Message.room, root.Message.selectedText, root.Message.hoveredLink);
} }
background: null background: null

2
src/messagecontent/QuoteComponent.qml
View File

@@ -63,7 +63,7 @@ QQC2.Control {
enabled: !quoteText.hoveredLink enabled: !quoteText.hoveredLink
acceptedDevices: PointerDevice.TouchScreen acceptedDevices: PointerDevice.TouchScreen
acceptedButtons: Qt.LeftButton acceptedButtons: Qt.LeftButton
onLongPressed: RoomManager.viewEventMenu(root.eventId, root.Message.room, root.author, root.Message.selectedText, root.Message.hoveredLink); onLongPressed: RoomManager.viewEventMenu(root.eventId, root.Message.room, root.Message.selectedText, root.Message.hoveredLink);
} }
} }

4
src/messagecontent/TextComponent.qml
View File

@@ -95,12 +95,12 @@ TextEdit {
enabled: !root.hoveredLink enabled: !root.hoveredLink
acceptedButtons: Qt.LeftButton acceptedButtons: Qt.LeftButton
acceptedDevices: PointerDevice.TouchScreen acceptedDevices: PointerDevice.TouchScreen
onLongPressed: RoomManager.viewEventMenu(root.eventId, root.Message.room, root.author, root.Message.selectedText, root.Message.hoveredLink); onLongPressed: RoomManager.viewEventMenu(root.eventId, root.Message.room, root.Message.selectedText, root.Message.hoveredLink);
} }
TapHandler { TapHandler {
acceptedButtons: Qt.RightButton acceptedButtons: Qt.RightButton
acceptedDevices: PointerDevice.Mouse | PointerDevice.TouchPad | PointerDevice.Stylus acceptedDevices: PointerDevice.Mouse | PointerDevice.TouchPad | PointerDevice.Stylus
gesturePolicy: TapHandler.WithinBounds gesturePolicy: TapHandler.WithinBounds
onTapped: RoomManager.viewEventMenu(root.eventId, root.Message.room, root.author, root.Message.selectedText, root.Message.hoveredLink); onTapped: RoomManager.viewEventMenu(root.eventId, root.Message.room, root.Message.selectedText, root.Message.hoveredLink);
} }
} }

2
src/timeline/HiddenDelegate.qml
View File

@@ -93,7 +93,7 @@ TimelineDelegate {
QtObject { QtObject {
id: _private id: _private
function showMessageMenu() { function showMessageMenu() {
RoomManager.viewEventMenu(root.eventId, root.room, root.author, ""); RoomManager.viewEventMenu(root.eventId, root.room, "");
} }
} }
} }

2
src/timeline/MessageDelegate.qml
View File

@@ -224,7 +224,7 @@ MessageDelegateBase {
id: _private id: _private
function showMessageMenu() { function showMessageMenu() {
RoomManager.viewEventMenu(root.eventId, root.room, root.author, root.Message.selectedText, root.Message.hoveredLink); RoomManager.viewEventMenu(root.eventId, root.room, root.Message.selectedText, root.Message.hoveredLink);
} }
} }
} }