d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-29 14:18:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

make lint

Browse source
This commit is contained in:
Loren Burkholder 2021-07-19 15:05:36 -04:00
parent 21eb312f69
commit 7cd4e6f1c6
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
resources/qml/InviteDialog.qml
View file

@ -72,9 +72,9 @@ ApplicationWindow {
Component.onCompleted: forceActiveFocus() Component.onCompleted: forceActiveFocus()
Keys.onShortcutOverride: event.accepted = ((event.key === Qt.Key_Return || event.key === Qt.Key_Enter) && (event.modifiers & Qt.ControlModifier)) Keys.onShortcutOverride: event.accepted = ((event.key === Qt.Key_Return || event.key === Qt.Key_Enter) && (event.modifiers & Qt.ControlModifier))
Keys.onPressed: { Keys.onPressed: {
if ((event.key === Qt.Key_Return || event.key === Qt.Key_Enter) && (event.modifiers === Qt.ControlModifier)) { if ((event.key === Qt.Key_Return || event.key === Qt.Key_Enter) && (event.modifiers === Qt.ControlModifier))
cleanUpAndClose(); cleanUpAndClose();
}
} }
} }

2
resources/qml/Root.qml
View file

@ -141,14 +141,12 @@ Page {
}); });
membersDialog.show(); membersDialog.show();
} }
onOpenRoomSettingsDialog: { onOpenRoomSettingsDialog: {
var roomSettings = roomSettingsComponent.createObject(timelineRoot, { var roomSettings = roomSettingsComponent.createObject(timelineRoot, {
"roomSettings": settings "roomSettings": settings
}); });
roomSettings.show(); roomSettings.show();
} }
onOpenInviteUsersDialog: { onOpenInviteUsersDialog: {
var dialog = inviteDialog.createObject(timelineRoot, { var dialog = inviteDialog.createObject(timelineRoot, {
"roomId": Rooms.currentRoom.roomId, "roomId": Rooms.currentRoom.roomId,