From 8a1075ed1effa0fec72cb46e3388cb33cd570c9e Mon Sep 17 00:00:00 2001 From: Yana Stamcheva Date: Sat, 19 Jan 2013 11:04:55 +0000 Subject: [PATCH] =?UTF-8?q?Fixes=20the=20chat=20menu=20bar=20keyboard=20na?= =?UTF-8?q?vigation.=20Fix=20provided=20by=20Markus=20Kil=C3=A5s=20on=20de?= =?UTF-8?q?v=20mailing=20list=20(subject:=20"Chat=20window=20menu=20bar=20?= =?UTF-8?q?can=20not=20be=20navigated=20using=20keyboard").?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sip/communicator/impl/gui/main/chat/ChatWindow.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java index 929e0de36..28dffb24d 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java @@ -1258,11 +1258,18 @@ public boolean dispatchKeyEvent(KeyEvent e) if(getCurrentChat() == null) return false; - + ChatWritePanel chatWritePanel = getCurrentChat().getChatWritePanel(); JEditorPane chatWriteEditor = chatWritePanel.getEditorPane(); + // Don't re-dispatch any events if the menu is active. Fixes the + // navigation in the menu. + if (menuBar.isSelected()) + { + return false; + } + if (keyManager.getFocusOwner() != null && !chatWritePanel.isFocusOwner()) {