Paper bag fix '?' to close help dialog

I failed to set the current dialog, which meant we never knew
what dialog to close when '?' was pressed when there was already
a dialog open.

Signed-off-by: Shawn O. Pearce <sop@google.com>

3 files changed, 9 insertions, 1 deletions

diff --git a/src/main/java/com/google/gwtexpui/globalkey/client/KeyCommandSet.java b/src/main/java/com/google/gwtexpui/globalkey/client/KeyCommandSet.java
index d190050..b2a0f93 100644
--- a/src/main/java/com/google/gwtexpui/globalkey/client/KeyCommandSet.java
+++ b/src/main/java/com/google/gwtexpui/globalkey/client/KeyCommandSet.java
@@ -117,7 +117,7 @@ public class KeyCommandSet implements KeyPressHandler {
     }
   }
 
-  private static int toMask(final KeyPressEvent event) {
+  static int toMask(final KeyPressEvent event) {
     int mask = event.getCharCode();
     if (event.isAltKeyDown()) {
       mask |= KeyCommand.M_ALT;
diff --git a/src/main/java/com/google/gwtexpui/globalkey/client/KeyHelpPopup.java b/src/main/java/com/google/gwtexpui/globalkey/client/KeyHelpPopup.java
index 6e2c276..36b5858 100644
--- a/src/main/java/com/google/gwtexpui/globalkey/client/KeyHelpPopup.java
+++ b/src/main/java/com/google/gwtexpui/globalkey/client/KeyHelpPopup.java
@@ -90,6 +90,13 @@ public class KeyHelpPopup extends PluginSafePopupPanel implements
 
   @Override
   public void onKeyPress(final KeyPressEvent event) {
+    if (KeyCommandSet.toMask(event) == ShowHelpCommand.INSTANCE.keyMask) {
+      // Block the '?' key from triggering us to show right after
+      // we just hide ourselves.
+      //
+      event.stopPropagation();
+      event.preventDefault();
+    }
     hide();
   }
 
diff --git a/src/main/java/com/google/gwtexpui/globalkey/client/ShowHelpCommand.java b/src/main/java/com/google/gwtexpui/globalkey/client/ShowHelpCommand.java
index f95c55e..c4fa6c0 100644
--- a/src/main/java/com/google/gwtexpui/globalkey/client/ShowHelpCommand.java
+++ b/src/main/java/com/google/gwtexpui/globalkey/client/ShowHelpCommand.java
@@ -47,6 +47,7 @@ public class ShowHelpCommand extends KeyCommand {
         current = null;
       }
     });
+    current = help;
     help.setPopupPositionAndShow(new PositionCallback() {
       @Override
       public void setPosition(final int pWidth, final int pHeight) {