Skip to content
Snippets Groups Projects
Verified Commit 373fb499 authored by Joe Donofry's avatar Joe Donofry
Browse files

Fix some keyboard shortcuts on macOS that involved arrow keys

parent eaea788a
No related branches found
No related tags found
No related merge requests found
Pipeline #5477 passed
......@@ -224,7 +224,7 @@ Rectangle {
} else if ((event.key == Qt.Key_Down || event.key == Qt.Key_Backtab) && popup.opened) {
event.accepted = true;
completer.down();
} else if (event.key == Qt.Key_Up && event.modifiers == Qt.NoModifier) {
} else if (event.key == Qt.Key_Up && (event.modifiers == Qt.NoModifier || event.modifiers == Qt.KeypadModifier)) {
if (cursorPosition == 0) {
event.accepted = true;
var idx = room.edit ? room.idToIndex(room.edit) + 1 : 0;
......@@ -242,7 +242,7 @@ Rectangle {
event.accepted = true;
positionCursorAtStart();
}
} else if (event.key == Qt.Key_Down && event.modifiers == Qt.NoModifier) {
} else if (event.key == Qt.Key_Down && (event.modifiers == Qt.NoModifier || event.modifiers == Qt.KeypadModifier)) {
if (cursorPosition == messageInput.length && room.edit) {
event.accepted = true;
var idx = room.idToIndex(room.edit) - 1;
......
......@@ -283,7 +283,7 @@ Item {
}
}
Shortcut {
sequence: StandardKey.MoveToPreviousPage
sequences: [StandardKey.MoveToPreviousPage]
onActivated: {
chat.contentY = chat.contentY - chat.height * 0.9;
......@@ -291,7 +291,7 @@ Item {
}
}
Shortcut {
sequence: StandardKey.MoveToNextPage
sequences: [StandardKey.MoveToNextPage]
onActivated: {
chat.contentY = chat.contentY + chat.height * 0.9;
......@@ -299,7 +299,7 @@ Item {
}
}
Shortcut {
sequence: StandardKey.Cancel
sequences: [StandardKey.Cancel]
onActivated: {
if (room.input.uploads.length > 0)
......
......@@ -127,12 +127,12 @@ Pane {
onActivated: Rooms.nextRoomWithActivity()
}
Shortcut {
sequence: "Ctrl+Down"
sequences: ["Ctrl+Down", "Ctrl+PgDown"]
onActivated: Rooms.nextRoom()
}
Shortcut {
sequence: "Ctrl+Up"
sequences: ["Ctrl+Up", "Ctrl+PgUp"]
onActivated: Rooms.previousRoom()
}
......
......@@ -39,7 +39,7 @@ Item {
emoji: true
}
Shortcut {
sequence: StandardKey.Close
sequences: [StandardKey.Close]
onActivated: Rooms.resetCurrentRoom()
}
......
......@@ -25,7 +25,7 @@ ApplicationWindow {
}
Shortcut {
sequence: StandardKey.Cancel
sequences: [StandardKey.Cancel]
onActivated: dbb.rejected()
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment