summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBerthold Krevert <berthold.krevert@basyskom.com>2014-04-08 18:48:25 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-09 16:04:10 +0200
commit2c58064fe0ae1c2a8abdb6425844785ebb2a09a5 (patch)
tree4af2b1e3ee6a4a0d0fddd6f9e124ab219ef7e5b6
parent59a6cb0b5ebdd5eae0152a9b34c1504006a7ccea (diff)
downloadqtquickcontrols-2c58064fe0ae1c2a8abdb6425844785ebb2a09a5.tar.gz
Fix left/right cursor keys in TextArea
Since commit 5dc805c86077e key events for left/right cursor get eaten by the MenuBar. That means, the events shouldn't be accepted if no menu is shown. Change-Id: Icc249a3c4d96e19e8c902276938a2972cf1364d9 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
-rw-r--r--src/controls/MenuBar.qml4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/controls/MenuBar.qml b/src/controls/MenuBar.qml
index 0f9b502f..0fe56ef1 100644
--- a/src/controls/MenuBar.qml
+++ b/src/controls/MenuBar.qml
@@ -176,6 +176,8 @@ MenuBarPrivate {
if (d.openedMenuIndex > 0) {
d.preselectMenuItem = true
d.openedMenuIndex--
+ } else {
+ event.accepted = false;
}
}
@@ -183,6 +185,8 @@ MenuBarPrivate {
if (d.openedMenuIndex !== -1 && d.openedMenuIndex < root.menus.length - 1) {
d.preselectMenuItem = true
d.openedMenuIndex++
+ } else {
+ event.accepted = false;
}
}