Explicitly delegate keyboard events from the PopupView popup to the relevant shortcut action handler (#8193)

svn changeset:24031/svn branch:6.8

1 files changed, 11 insertions, 9 deletions

diff --git a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java b/tests/testbench/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java
index 7009d03f77..c8d4ee9858 100644
--- a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java
+++ b/tests/testbench/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java
@@ -45,16 +45,18 @@ public class PopupViewClickShortcut extends TestBase {
         l.setCaption(caption);
         l.setWidth(null);
 
-        Button b = new Button("Submit " + caption, new Button.ClickListener() {
-            private int i = 5;
+        Button b = new Button("Submit " + caption + " (Ctrl+Alt+"
+                + String.valueOf(Character.toChars(keyCode)) + ")",
+                new Button.ClickListener() {
+                    private int i = 5;
 
-            public void buttonClick(ClickEvent event) {
-                log.log("Submitted from "
-                        + event.getButton().getParent().getCaption());
-                t.addItem(new String[] { "added " + i++ }, i);
-            }
-        });
-        b.setClickShortcut(keyCode, ModifierKey.ALT);
+                    public void buttonClick(ClickEvent event) {
+                        log.log("Submitted from "
+                                + event.getButton().getParent().getCaption());
+                        t.addItem(new String[] { "added " + i++ }, i);
+                    }
+                });
+        b.setClickShortcut(keyCode, ModifierKey.CTRL, ModifierKey.ALT);
 
         l.addComponent(t);
         l.addComponent(b);