diff --git a/resources/qml/InviteDialog.qml b/resources/qml/InviteDialog.qml
index 94a95861..b1b1bb39 100644
--- a/resources/qml/InviteDialog.qml
+++ b/resources/qml/InviteDialog.qml
@@ -24,6 +24,7 @@ ApplicationWindow {
function cleanUpAndClose() {
if (inviteeEntry.text.match("@.+?:.{3,}"))
addInvite();
+
invitees.accept();
close();
}
@@ -64,15 +65,17 @@ ApplicationWindow {
placeholderText: qsTr("@joe:matrix.org", "Example user id. The name 'joe' can be localized however you want.")
Layout.fillWidth: true
onAccepted: {
- if (text !== "") {
+ if (text !== "")
addInvite();
- }
+
}
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)) cleanUpAndClose()
-
+ Keys.onPressed: {
+ if ((event.key === Qt.Key_Return || event.key === Qt.Key_Enter) && (event.modifiers === Qt.ControlModifier)) {
+ cleanUpAndClose();
+ }
+ }
}
Button {
diff --git a/resources/qml/RoomMembers.qml b/resources/qml/RoomMembers.qml
index 0d957165..57353132 100644
--- a/resources/qml/RoomMembers.qml
+++ b/resources/qml/RoomMembers.qml
@@ -2,12 +2,12 @@
//
// SPDX-License-Identifier: GPL-3.0-or-later
+import "./ui"
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12
import QtQuick.Window 2.12
import im.nheko 1.0
-import "./ui"
ApplicationWindow {
id: roomMembersRoot
@@ -110,7 +110,9 @@ ApplicationWindow {
Layout.fillHeight: true
Layout.fillWidth: true
}
+
}
+
}
footer: Spinner {
@@ -119,12 +121,16 @@ ApplicationWindow {
height: visible ? undefined : 0
anchors.centerIn: parent
}
+
}
+
}
+
}
footer: DialogButtonBox {
standardButtons: DialogButtonBox.Ok
onAccepted: roomMembersRoot.close()
}
+
}
diff --git a/resources/qml/Root.qml b/resources/qml/Root.qml
index 31d00585..102d0411 100644
--- a/resources/qml/Root.qml
+++ b/resources/qml/Root.qml
@@ -52,6 +52,7 @@ Page {
RoomMembers {
}
+
}
Component {
@@ -77,11 +78,13 @@ Page {
}
}
+
Component {
id: inviteDialog
InviteDialog {
}
+
}
Shortcut {
diff --git a/src/MemberList.cpp b/src/MemberList.cpp
index dd5997f5..04377a0f 100644
--- a/src/MemberList.cpp
+++ b/src/MemberList.cpp
@@ -60,7 +60,11 @@ MemberList::addUsers(const std::vector<RoomMember> &members)
QHash<int, QByteArray>
MemberList::roleNames() const
{
- return {{Mxid, "mxid"}, {DisplayName, "displayName"}, {AvatarUrl, "avatarUrl"},};
+ return {
+ {Mxid, "mxid"},
+ {DisplayName, "displayName"},
+ {AvatarUrl, "avatarUrl"},
+ };
}
QVariant
|