Block enter key from pressing active button.

2 files changed, 27 insertions, 0 deletions

diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index c99f46149..9519c144f 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -448,3 +448,26 @@ void Button::setCaption(const std::string& caption)
     mCaption = caption;
 //    adjustSize();
 }
+
+void Button::keyPressed(gcn::KeyEvent& keyEvent)
+{
+    gcn::Key key = keyEvent.getKey();
+
+    if (key.getValue() == gcn::Key::SPACE)
+    {
+        mKeyPressed = true;
+        keyEvent.consume();
+    }
+}
+
+void Button::keyReleased(gcn::KeyEvent& keyEvent)
+{
+    gcn::Key key = keyEvent.getKey();
+
+    if (key.getValue() == gcn::Key::SPACE && mKeyPressed)
+    {
+        mKeyPressed = false;
+        distributeActionEvent();
+        keyEvent.consume();
+    }
+}
diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h
index 6585d9850..8e4cdd9e6 100644
--- a/src/gui/widgets/button.h
+++ b/src/gui/widgets/button.h
@@ -113,6 +113,10 @@ class Button : public gcn::Button, public gcn::WidgetListener
 
         void setCaption(const std::string& caption);
 
+        void keyPressed(gcn::KeyEvent &keyEvent);
+
+        void keyReleased(gcn::KeyEvent &keyEvent);
+
     private:
         void init();