From 8881b71079e86e5beb55a2a84ca2c0fc427f497a Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 28 Sep 2015 14:36:10 +0200 Subject: do tab completion only if neither ctrl nor alt are being pressed --- src/main/java/eu/siacs/conversations/ui/EditMessage.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/ui/EditMessage.java b/src/main/java/eu/siacs/conversations/ui/EditMessage.java index 968ce669..fc655b0c 100644 --- a/src/main/java/eu/siacs/conversations/ui/EditMessage.java +++ b/src/main/java/eu/siacs/conversations/ui/EditMessage.java @@ -37,13 +37,13 @@ public class EditMessage extends EditText { protected KeyboardListener keyboardListener; @Override - public boolean onKeyDown(int keyCode, KeyEvent event) { - if (keyCode == KeyEvent.KEYCODE_ENTER && !event.isShiftPressed()) { + public boolean onKeyDown(int keyCode, KeyEvent e) { + if (keyCode == KeyEvent.KEYCODE_ENTER && !e.isShiftPressed()) { lastInputWasTab = false; if (keyboardListener != null && keyboardListener.onEnterPressed()) { return true; } - } else if (keyCode == KeyEvent.KEYCODE_TAB) { + } else if (keyCode == KeyEvent.KEYCODE_TAB && !e.isAltPressed() && !e.isCtrlPressed()) { if (keyboardListener != null && keyboardListener.onTabPressed(this.lastInputWasTab)) { lastInputWasTab = true; return true; @@ -51,7 +51,7 @@ public class EditMessage extends EditText { } else { lastInputWasTab = false; } - return super.onKeyDown(keyCode, event); + return super.onKeyDown(keyCode, e); } @Override -- cgit v1.2.3