From 1beaf18d1baf096bec57aff78c70397fb76d1597 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Mon, 27 Apr 2015 16:00:23 -0700
Subject: [PATCH] Prevent the login dialog from spawning the address bar on
 enter keys

---
 interface/resources/qml/LoginDialog.qml | 28 ++++++++++++++++---------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/interface/resources/qml/LoginDialog.qml b/interface/resources/qml/LoginDialog.qml
index 1e02683c57..5653dfc7a1 100644
--- a/interface/resources/qml/LoginDialog.qml
+++ b/interface/resources/qml/LoginDialog.qml
@@ -60,9 +60,6 @@ Dialog {
                     anchors.margins: 8
                     KeyNavigation.tab: password
                     KeyNavigation.backtab: password
-                    onAccepted: {
-                        password.forceActiveFocus()
-                    }
                 }
             }
 
@@ -78,13 +75,6 @@ Dialog {
                     anchors.margins: 8
                     KeyNavigation.tab: username
                     KeyNavigation.backtab: username
-                    onAccepted: {
-                        if (username.text == "") {
-                            username.forceActiveFocus()
-                        } else {
-                            loginDialog.login(username.text, password.text)
-                        }
-                    }
                     onFocusChanged: {
                         if (password.focus) {
                             password.selectAll()
@@ -187,4 +177,22 @@ Dialog {
             }
         }
     }
+    Keys.onPressed: {
+        switch(event.key) {
+            case Qt.Key_Enter:
+            case Qt.Key_Return:
+                if (username.activeFocus) {
+                    event.accepted = true
+                    password.forceActiveFocus()
+                } else if (password.activeFocus) {
+                    event.accepted = true
+                    if (username.text == "") {
+                        username.forceActiveFocus()
+                    } else {
+                        loginDialog.login(username.text, password.text)
+                    }
+                }
+                break;
+        }
+    }
 }