Skip to content
Snippets Groups Projects
Commit 77b8f285 authored by Ming Rui Zhang's avatar Ming Rui Zhang
Browse files

keyEvent: replace the unclear StandardKey comparisons

StandardKey.MoveToNextLine, StandardKey.MoveToPreviousLine
and StandardKey.InsertParagraphSeparator maybe confusing and
better to be replaced by direct key comparisons

Change-Id: I13361a43437214b9368d01a97b2e542f57835964
parent 6ceba6a7
No related branches found
No related tags found
No related merge requests found
...@@ -31,7 +31,8 @@ PushButton { ...@@ -31,7 +31,8 @@ PushButton {
toolTipText: JamiStrings.back toolTipText: JamiStrings.back
Keys.onPressed: function (keyEvent) { Keys.onPressed: function (keyEvent) {
if (keyEvent.matches(StandardKey.InsertParagraphSeparator)) { if (keyEvent.key === Qt.Key_Enter ||
keyEvent.key === Qt.Key_Return) {
clicked() clicked()
keyEvent.accepted = true keyEvent.accepted = true
} }
......
...@@ -54,7 +54,8 @@ Switch { ...@@ -54,7 +54,8 @@ Switch {
} }
Keys.onPressed: function (keyEvent) { Keys.onPressed: function (keyEvent) {
if (keyEvent.matches(StandardKey.InsertParagraphSeparator)) { if (keyEvent.key === Qt.Key_Enter ||
keyEvent.key === Qt.Key_Return) {
checked = !checked checked = !checked
keyEvent.accepted = true keyEvent.accepted = true
} }
......
...@@ -191,7 +191,8 @@ Button { ...@@ -191,7 +191,8 @@ Button {
} }
Keys.onPressed: function (keyEvent) { Keys.onPressed: function (keyEvent) {
if (keyEvent.matches(StandardKey.InsertParagraphSeparator)) { if (keyEvent.key === Qt.Key_Enter ||
keyEvent.key === Qt.Key_Return) {
clicked() clicked()
keyEvent.accepted = true keyEvent.accepted = true
} }
......
...@@ -198,10 +198,11 @@ Item { ...@@ -198,10 +198,11 @@ Item {
JamiResources.baseline_camera_alt_24dp_svg JamiResources.baseline_camera_alt_24dp_svg
Keys.onPressed: function (keyEvent) { Keys.onPressed: function (keyEvent) {
if (keyEvent.matches(StandardKey.InsertParagraphSeparator)) { if (keyEvent.key === Qt.Key_Enter ||
keyEvent.key === Qt.Key_Return) {
clicked() clicked()
keyEvent.accepted = true keyEvent.accepted = true
} else if (keyEvent.matches(StandardKey.MoveToPreviousLine)) { } else if (keyEvent.key === Qt.Key_Up) {
root.focusOnPreviousItem() root.focusOnPreviousItem()
keyEvent.accepted = true keyEvent.accepted = true
} }
...@@ -245,11 +246,12 @@ Item { ...@@ -245,11 +246,12 @@ Item {
KeyNavigation.up: takePhotoButton KeyNavigation.up: takePhotoButton
Keys.onPressed: function (keyEvent) { Keys.onPressed: function (keyEvent) {
if (keyEvent.matches(StandardKey.InsertParagraphSeparator)) { if (keyEvent.key === Qt.Key_Enter ||
keyEvent.key === Qt.Key_Return) {
clicked() clicked()
takePhotoButton.forceActiveFocus() takePhotoButton.forceActiveFocus()
keyEvent.accepted = true keyEvent.accepted = true
} else if (keyEvent.matches(StandardKey.MoveToNextLine) || } else if (keyEvent.key === Qt.Key_Down ||
keyEvent.key === Qt.Key_Tab) { keyEvent.key === Qt.Key_Tab) {
if (isPreviewing) { if (isPreviewing) {
root.focusOnNextItem() root.focusOnNextItem()
...@@ -283,11 +285,12 @@ Item { ...@@ -283,11 +285,12 @@ Item {
imageColor: JamiTheme.textColor imageColor: JamiTheme.textColor
Keys.onPressed: function (keyEvent) { Keys.onPressed: function (keyEvent) {
if (keyEvent.matches(StandardKey.InsertParagraphSeparator)) { if (keyEvent.key === Qt.Key_Enter ||
keyEvent.key === Qt.Key_Return) {
focusAfterFileDialogClosed = true focusAfterFileDialogClosed = true
clicked() clicked()
keyEvent.accepted = true keyEvent.accepted = true
} else if (keyEvent.matches(StandardKey.MoveToNextLine) || } else if (keyEvent.key === Qt.Key_Down ||
keyEvent.key === Qt.Key_Tab) { keyEvent.key === Qt.Key_Tab) {
root.focusOnNextItem() root.focusOnNextItem()
keyEvent.accepted = true keyEvent.accepted = true
......
...@@ -134,7 +134,8 @@ Rectangle { ...@@ -134,7 +134,8 @@ Rectangle {
} }
Keys.onPressed: function (keyEvent) { Keys.onPressed: function (keyEvent) {
if (keyEvent.matches(StandardKey.InsertParagraphSeparator)) { if (keyEvent.key === Qt.Key_Enter ||
keyEvent.key === Qt.Key_Return) {
if (contactSearchBar.text !== "") { if (contactSearchBar.text !== "") {
returnPressedWhileSearching() returnPressedWhileSearching()
keyEvent.accepted = true keyEvent.accepted = true
......
...@@ -138,7 +138,8 @@ Flickable { ...@@ -138,7 +138,8 @@ Flickable {
if (keyEvent.matches(StandardKey.Paste)) { if (keyEvent.matches(StandardKey.Paste)) {
MessagesAdapter.pasteKeyDetected() MessagesAdapter.pasteKeyDetected()
keyEvent.accepted = true keyEvent.accepted = true
} else if (keyEvent.matches(StandardKey.InsertParagraphSeparator)) { } else if (keyEvent.key === Qt.Key_Enter ||
keyEvent.key === Qt.Key_Return) {
if (!(keyEvent.modifiers & Qt.ShiftModifier)) { if (!(keyEvent.modifiers & Qt.ShiftModifier)) {
root.sendMessagesRequired() root.sendMessagesRequired()
keyEvent.accepted = true keyEvent.accepted = true
......
...@@ -154,7 +154,7 @@ Rectangle { ...@@ -154,7 +154,7 @@ Rectangle {
KeyNavigation.down: KeyNavigation.tab KeyNavigation.down: KeyNavigation.tab
Keys.onPressed: function (keyEvent) { Keys.onPressed: function (keyEvent) {
if (keyEvent.matches(StandardKey.MoveToPreviousLine)) { if (keyEvent.key === Qt.Key_Up) {
setAvatarWidget.focusOnPreviousPhotoBoothItem() setAvatarWidget.focusOnPreviousPhotoBoothItem()
keyEvent.accepted = true keyEvent.accepted = true
} }
...@@ -221,7 +221,7 @@ Rectangle { ...@@ -221,7 +221,7 @@ Rectangle {
KeyNavigation.up: saveProfileBtn KeyNavigation.up: saveProfileBtn
Keys.onPressed: function (keyEvent) { Keys.onPressed: function (keyEvent) {
if (keyEvent.matches(StandardKey.MoveToNextLine) || if (keyEvent.key === Qt.Key_Down ||
keyEvent.key === Qt.Key_Tab) { keyEvent.key === Qt.Key_Tab) {
setAvatarWidget.focusOnNextPhotoBoothItem() setAvatarWidget.focusOnNextPhotoBoothItem()
keyEvent.accepted = true keyEvent.accepted = true
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment