From c53b0a87a23a79702c2efe05159d9627862366ce Mon Sep 17 00:00:00 2001
From: RadRussianRus <radrussianrus@gmail.com>
Date: Mon, 10 Sep 2018 20:08:13 +0300
Subject: [PATCH] Fixed keyboard navigation

---
 slice/Main.qml | 54 ++++++++++++++++++++++++++++++--------------------
 1 file changed, 33 insertions(+), 21 deletions(-)

diff --git a/slice/Main.qml b/slice/Main.qml
index baaed22..f6c0fad 100644
--- a/slice/Main.qml
+++ b/slice/Main.qml
@@ -177,9 +177,6 @@ Rectangle
             width: areaMain.width
             height: areaMain.height
 
-            Keys.onTabPressed: { root.state = "stateSessions" }
-            Keys.onBacktabPressed: { root.state = "stateUsers" }
-
             Behavior on x { NumberAnimation { duration: 150 } }
         }
 
@@ -189,15 +186,6 @@ Rectangle
             width: areaMain.width
             height: areaMain.height
 
-            Keys.onTabPressed: { root.state = "stateUsers" }
-            Keys.onBacktabPressed:
-            {
-                if (buttonPagePower.enabled)
-                    root.state = "statePower"
-                else
-                    root.state = "stateSessions"
-            }
-
             Behavior on x { NumberAnimation { duration: 150 } }
 
             onSelectedIndexChanged: pageUsers.selectedSessionIndex = selectedIndex
@@ -211,15 +199,6 @@ Rectangle
             width: areaMain.width
             height: areaMain.height
 
-            Keys.onTabPressed:
-            {
-                if (buttonPagePower.enabled)
-                    root.state = "statePower"
-                else
-                    root.state = "stateSessions"
-            }
-            Keys.onBacktabPressed: { root.state = "stateSessions" }
-
             Behavior on x { NumberAnimation { duration: 150 } }
 
             onLockNav: areaTop.enabled = false
@@ -396,5 +375,38 @@ Rectangle
             }
         }
     }
+
+    Keys.onTabPressed: {
+        switch(root.state)
+        {
+            case "statePower":
+                root.state = "stateSessions";
+                break;
+
+            case "stateSessions":
+                root.state = "stateUsers";
+                break;
+
+            case "stateUsers":
+                root.state = (buttonPagePower.enabled) ? "statePower" : "stateSessions";
+                break;
+        }
+    }
+    Keys.onBacktabPressed: { 
+        switch(root.state)
+        {
+            case "statePower":
+                root.state = "stateUsers";
+                break;
+
+            case "stateSessions":
+                root.state = (buttonPagePower.enabled) ? "statePower" : "stateUsers";
+                break;
+
+            case "stateUsers":
+                root.state = "stateSessions";
+                break;
+        }
+    }
 }