rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid completer jitter before closing

This commit is contained in:
Thomas Karpiniec 2021-08-21 14:01:10 +10:00
parent a24348b574
commit 92e8cd0681
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
resources/qml/MessageInput.qml
View File

@ -93,7 +93,7 @@ Rectangle {
TextArea { TextArea {
id: messageInput id: messageInput
property int completerTriggeredAt: -1 property int completerTriggeredAt: 0
function insertCompletion(completion) { function insertCompletion(completion) {
messageInput.remove(completerTriggeredAt, cursorPosition); messageInput.remove(completerTriggeredAt, cursorPosition);
@ -134,8 +134,7 @@ Rectangle {
return ; return ;
room.input.updateState(selectionStart, selectionEnd, cursorPosition, text); room.input.updateState(selectionStart, selectionEnd, cursorPosition, text);
if (cursorPosition <= completerTriggeredAt) { if (popup.opened && cursorPosition <= completerTriggeredAt) {
completerTriggeredAt = -1;
popup.close(); popup.close();
} }
if (popup.opened) if (popup.opened)
@ -145,7 +144,7 @@ Rectangle {
onSelectionStartChanged: room.input.updateState(selectionStart, selectionEnd, cursorPosition, text) onSelectionStartChanged: room.input.updateState(selectionStart, selectionEnd, cursorPosition, text)
onSelectionEndChanged: room.input.updateState(selectionStart, selectionEnd, cursorPosition, text) onSelectionEndChanged: room.input.updateState(selectionStart, selectionEnd, cursorPosition, text)
// Ensure that we get escape key press events first. // Ensure that we get escape key press events first.
Keys.onShortcutOverride: event.accepted = (completerTriggeredAt != -1 && (event.key === Qt.Key_Escape || event.key === Qt.Key_Tab || event.key === Qt.Key_Enter)) Keys.onShortcutOverride: event.accepted = (popup.opened && (event.key === Qt.Key_Escape || event.key === Qt.Key_Tab || event.key === Qt.Key_Enter))
Keys.onPressed: { Keys.onPressed: {
if (event.matches(StandardKey.Paste)) { if (event.matches(StandardKey.Paste)) {
room.input.paste(false); room.input.paste(false);
@ -174,12 +173,10 @@ Rectangle {
messageInput.openCompleter(selectionStart, "roomAliases"); messageInput.openCompleter(selectionStart, "roomAliases");
popup.open(); popup.open();
} else if (event.key == Qt.Key_Escape && popup.opened) { } else if (event.key == Qt.Key_Escape && popup.opened) {
completerTriggeredAt = -1;
popup.completerName = ""; popup.completerName = "";
popup.close(); popup.close();
event.accepted = true; event.accepted = true;
} else if (event.matches(StandardKey.SelectAll) && popup.opened) { } else if (event.matches(StandardKey.SelectAll) && popup.opened) {
completerTriggeredAt = -1;
popup.completerName = ""; popup.completerName = "";
popup.close(); popup.close();
} else if (event.matches(StandardKey.InsertParagraphSeparator)) { } else if (event.matches(StandardKey.InsertParagraphSeparator)) {
@ -270,7 +267,6 @@ Rectangle {
if (room) if (room)
messageInput.append(room.input.text()); messageInput.append(room.input.text());
messageInput.completerTriggeredAt = -1;
popup.completerName = ""; popup.completerName = "";
messageInput.forceActiveFocus(); messageInput.forceActiveFocus();
} }
@ -289,8 +285,8 @@ Rectangle {
Completer { Completer {
id: popup id: popup
x: messageInput.completerTriggeredAt >= 0 ? messageInput.positionToRectangle(messageInput.completerTriggeredAt).x : 0 x: messageInput.positionToRectangle(messageInput.completerTriggeredAt).x
y: messageInput.completerTriggeredAt >= 0 ? messageInput.positionToRectangle(messageInput.completerTriggeredAt).y - height : 0 y: messageInput.positionToRectangle(messageInput.completerTriggeredAt).y - height
} }
Connections { Connections {