Client|LineEditWidget: Use key modifiers (word jumping)

skyjake · Jul 24, 2013 · 9098153 · 9098153 · danij-deng · Jul 25, 2013
1 parent 887dc30
commit 9098153
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/doomsday/client/include/ui/widgets/lineeditwidget.h b/doomsday/client/include/ui/widgets/lineeditwidget.h
@@ -21,6 +21,7 @@
 
 #include "guiwidget.h"
 #include <de/shell/AbstractLineEditor>
+#include <de/KeyEvent>
 
 /**
  * Widget showing a lineedit text and/or image.
@@ -50,6 +51,9 @@ class LineEditWidget : public GuiWidget, public de::shell::AbstractLineEditor
     void drawContent();
     bool handleEvent(de::Event const &event);
 
+public:
+    static KeyModifiers modifiersFromKeyEvent(de::KeyEvent::Modifiers const &keyMods);
+
 protected:
     void glInit();
     void glDeinit();

diff --git a/doomsday/client/src/ui/widgets/lineeditwidget.cpp b/doomsday/client/src/ui/widgets/lineeditwidget.cpp
@@ -384,7 +384,7 @@ bool LineEditWidget::handleEvent(Event const &event)
         KeyEvent const &key = event.as<KeyEvent>();
 
         // Control character.
-        if(handleControlKey(key.qtKey(), key.modifiers().testFlag(KeyEvent::Control)))
+        if(handleControlKey(key.qtKey(), modifiersFromKeyEvent(key.modifiers())))
         {
             return true;
         }
@@ -401,6 +401,18 @@ bool LineEditWidget::handleEvent(Event const &event)
     return GuiWidget::handleEvent(event);
 }
 
+shell::AbstractLineEditor::KeyModifiers LineEditWidget::modifiersFromKeyEvent(KeyEvent::Modifiers const &keyMods)
+{
+    KeyModifiers mods;
+
+    if(keyMods.testFlag(KeyEvent::Shift))   mods |= Shift;
+    if(keyMods.testFlag(KeyEvent::Control)) mods |= Control;
+    if(keyMods.testFlag(KeyEvent::Alt))     mods |= Alt;
+    if(keyMods.testFlag(KeyEvent::Meta))    mods |= Meta;
+
+    return mods;
+}
+
 int LineEditWidget::maximumWidth() const
 {
     return rule().recti().width() - 2 * d->margin;