Fixed|Client|libshell: Minor issues with word jump behavior

skyjake · Jul 25, 2013 · 5087b9b · 5087b9b
1 parent b111a67
commit 5087b9b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/doomsday/client/src/ui/widgets/lineeditwidget.cpp b/doomsday/client/src/ui/widgets/lineeditwidget.cpp
@@ -383,6 +383,13 @@ bool LineEditWidget::handleEvent(Event const &event)
     {
         KeyEvent const &key = event.as<KeyEvent>();
 
+        if(key.qtKey() == Qt::Key_Control || key.qtKey() == Qt::Key_Alt ||
+           key.qtKey() == Qt::Key_Meta)
+        {
+            // Modifier keys alone will be eaten when focused.
+            return true;
+        }
+
         // Control character.
         if(handleControlKey(key.qtKey(), modifiersFromKeyEvent(key.modifiers())))
         {

diff --git a/doomsday/libshell/src/abstractlineeditor.cpp b/doomsday/libshell/src/abstractlineeditor.cpp
@@ -230,7 +230,10 @@ DENG2_PIMPL(AbstractLineEditor)
         }
 
         // Jump over any non-word chars.
-        while(cursor < last && !text[cursor].isLetterOrNumber()) cursor++;
+        while(cursor <= last && !text[de::min(last, cursor)].isLetterOrNumber())
+        {
+            cursor++;
+        }
 
         self.cursorMoved();
     }