Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix stuck menu options on community/room list #1090

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix stuck menu options on community/room list #1090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 14 additions & 19 deletions resources/qml/CommunitiesList.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,23 +32,6 @@ Page {
enabled: !Settings.mobileMode
}

Platform.Menu {
id: communityContextMenu

property string tagId

function show(id_, tags_) {
tagId = id_;
open();
}

Platform.MenuItem {
text: qsTr("Hide rooms with this tag or from this space by default.")
onTriggered: Communities.toggleTagId(communityContextMenu.tagId)
}

}

delegate: ItemDelegate {
id: communityItem

Expand All @@ -65,7 +48,7 @@ Page {
ToolTip.text: model.tooltip
ToolTip.delay: Nheko.tooltipDelay
onClicked: Communities.setCurrentTagId(model.id)
onPressAndHold: communityContextMenu.show(model.id)
onPressAndHold: communityContextMenu.open()
states: [
State {
name: "highlight"
Expand Down Expand Up @@ -97,12 +80,24 @@ Page {
}
]

Platform.Menu {
id: communityContextMenu

Platform.MenuItem {
text: qsTr("Hide rooms with this tag or from this space by default.")
checkable: true
checked: model.hidden
onTriggered: Communities.toggleTagId(model.id);
}

}

Item {
anchors.fill: parent

TapHandler {
acceptedButtons: Qt.RightButton
onSingleTapped: communityContextMenu.show(model.id)
onSingleTapped: communityContextMenu.open()
gesturePolicy: TapHandler.ReleaseWithinBounds
acceptedDevices: PointerDevice.Mouse | PointerDevice.Stylus | PointerDevice.TouchPad
}
Expand Down
149 changes: 70 additions & 79 deletions resources/qml/RoomList.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,83 +109,6 @@ Page {

}

Platform.Menu {
id: roomContextMenu

property string roomid
property var tags

function show(roomid_, tags_) {
roomid = roomid_;
tags = tags_;
open();
}

InputDialog {
id: newTag

title: qsTr("New tag")
prompt: qsTr("Enter the tag you want to use:")
onAccepted: function(text) {
Rooms.toggleTag(roomContextMenu.roomid, "u." + text, true);
}
}

Platform.MenuItem {
text: qsTr("Open separately")
onTriggered: {
var roomWindow = roomWindowComponent.createObject(null, {
"room": Rooms.getRoomById(roomContextMenu.roomid),
"roomPreview": Rooms.getRoomPreviewById(roomContextMenu.roomid)
});
roomWindow.showNormal();
destroyOnClose(roomWindow);
}
}

Platform.MenuItem {
text: qsTr("Leave room")
onTriggered: TimelineManager.openLeaveRoomDialog(roomContextMenu.roomid)
}

Platform.MenuSeparator {
text: qsTr("Tag room as:")
}

Instantiator {
model: Communities.tagsWithDefault
onObjectAdded: roomContextMenu.insertItem(index + 3, object)
onObjectRemoved: roomContextMenu.removeItem(object)

delegate: Platform.MenuItem {
property string t: modelData

text: {
switch (t) {
case "m.favourite":
return qsTr("Favourite");
case "m.lowpriority":
return qsTr("Low priority");
case "m.server_notice":
return qsTr("Server notice");
default:
return t.substring(2);
}
}
checkable: true
checked: roomContextMenu.tags !== undefined && roomContextMenu.tags.includes(t)
onTriggered: Rooms.toggleTag(roomContextMenu.roomid, t, checked)
}

}

Platform.MenuItem {
text: qsTr("Create new tag...")
onTriggered: newTag.show()
}

}

delegate: ItemDelegate {
id: roomItem

Expand Down Expand Up @@ -231,7 +154,7 @@ Page {
}
onPressAndHold: {
if (!isInvite)
roomContextMenu.show(roomId, tags);
roomContextMenu.open();

}
states: [
Expand Down Expand Up @@ -265,6 +188,74 @@ Page {
}
]

Platform.Menu {
id: roomContextMenu

InputDialog {
id: newTag

title: qsTr("New tag")
prompt: qsTr("Enter the tag you want to use:")
onAccepted: function(text) {
Rooms.toggleTag(roomId, "u." + text, true);
}
}

Platform.MenuItem {
text: qsTr("Open separately")
onTriggered: {
var roomWindow = roomWindowComponent.createObject(null, {
"room": Rooms.getRoomById(roomId),
"roomPreview": Rooms.getRoomPreviewById(roomId)
});
roomWindow.showNormal();
destroyOnClose(roomWindow);
}
}

Platform.MenuItem {
text: qsTr("Leave room")
onTriggered: TimelineManager.openLeaveRoomDialog(roomId)
}

Platform.MenuSeparator {
text: qsTr("Tag room as:")
}

Instantiator {
model: Communities.tagsWithDefault
onObjectAdded: roomContextMenu.insertItem(index + 3, object)
onObjectRemoved: roomContextMenu.removeItem(object)

delegate: Platform.MenuItem {
property string t: modelData

text: {
switch (t) {
case "m.favourite":
return qsTr("Favourite");
case "m.lowpriority":
return qsTr("Low priority");
case "m.server_notice":
return qsTr("Server notice");
default:
return t.substring(2);
}
}
checkable: true
checked: tags !== undefined && tags.includes(t)
onTriggered: Rooms.toggleTag(roomId, t, checked)
}

}

Platform.MenuItem {
text: qsTr("Create new tag...")
onTriggered: newTag.show()
}

}

// NOTE(Nico): We want to prevent the touch areas from overlapping. For some reason we need to add 1px of padding for that...
Item {
anchors.fill: parent
Expand All @@ -274,7 +265,7 @@ Page {
acceptedButtons: Qt.RightButton
onSingleTapped: {
if (!TimelineManager.isInvite)
roomContextMenu.show(roomId, tags);
roomContextMenu.open();

}
gesturePolicy: TapHandler.ReleaseWithinBounds
Expand Down