diff options
| author | Loren Burkholder <computersemiexpert@outlook.com> | 2021-07-19 15:05:36 -0400 |
|---|---|---|
| committer | Loren Burkholder <computersemiexpert@outlook.com> | 2021-07-20 21:48:03 -0400 |
| commit | 7cd4e6f1c6fd73edcdeb3cc6918f009d100d2fa1 (patch) | |
| tree | 41b68c11ecb555ffef867b4aef4e0c8bade9b12a /resources | |
| parent | Only run spinner while loading members (diff) | |
| download | nheko-7cd4e6f1c6fd73edcdeb3cc6918f009d100d2fa1.tar.xz | |
make lint
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/qml/InviteDialog.qml | 4 | ||||
| -rw-r--r-- | resources/qml/Root.qml | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/resources/qml/InviteDialog.qml b/resources/qml/InviteDialog.qml index b1b1bb39..1eaaef8f 100644 --- a/resources/qml/InviteDialog.qml +++ b/resources/qml/InviteDialog.qml @@ -72,9 +72,9 @@ ApplicationWindow { Component.onCompleted: forceActiveFocus() Keys.onShortcutOverride: event.accepted = ((event.key === Qt.Key_Return || event.key === Qt.Key_Enter) && (event.modifiers & Qt.ControlModifier)) 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(); - } + } } diff --git a/resources/qml/Root.qml b/resources/qml/Root.qml index 0a0f90cf..b5395232 100644 --- a/resources/qml/Root.qml +++ b/resources/qml/Root.qml @@ -141,14 +141,12 @@ Page { }); membersDialog.show(); } - onOpenRoomSettingsDialog: { var roomSettings = roomSettingsComponent.createObject(timelineRoot, { "roomSettings": settings }); roomSettings.show(); } - onOpenInviteUsersDialog: { var dialog = inviteDialog.createObject(timelineRoot, { "roomId": Rooms.currentRoom.roomId, |