UI|Client: Order of key modifiers in pretty-printed binding

skyjake · Mar 10, 2014 · 355080e · 355080e
1 parent 8173ce9
commit 355080e
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/doomsday/client/src/ui/widgets/inputbindingwidget.cpp b/doomsday/client/src/ui/widgets/inputbindingwidget.cpp
@@ -63,22 +63,22 @@ DENG_GUI_PIMPL(InputBindingWidget)
             return eventDesc;
         }
 
-        String name = eventDesc.mid(4, eventDesc.indexOf("-", 4) - 4);
-        name = name.mid(0, 1).toUpper() + name.mid(1).toLower();
+        String name = eventDesc.substr(Rangei(4, eventDesc.indexOf("-", 4)));
+        name = name.left(1).toUpper() + name.mid(1).toLower();
 
         // Any modifiers?
         int idx = eventDesc.indexOf("+");
         if(idx > 0)
         {
             String const conds = eventDesc.mid(idx + 1);
-            if(conds.contains("key-ctrl-down") || conds.contains("key-control-down"))
-            {
-                name = String(CONTROL_CHAR) + name;
-            }
             if(conds.contains("key-alt-down"))
             {
                 name = String(DENG2_CHAR_ALT_KEY) + name;
             }
+            if(conds.contains("key-ctrl-down") || conds.contains("key-control-down"))
+            {
+                name = String(CONTROL_CHAR) + name;
+            }
             if(conds.contains("key-shift-down"))
             {
                 name = String(DENG2_CHAR_SHIFT_KEY) + name;