Consolidate input logic into BrowserView

layouts/components/BrowserView.qml

@@ -3,16 +3,20 @@ import QtQuick 2.12
 import "./BrowserView"
 
 Row {
-    anchors.fill: parent
     property int selectedView: 0
+    property int selectedProvider: 0
+    property var db
     Sidebar {
         id: sidebar
-        maximized: parent.selectedView == 0
+        maximized: selectedView == 0
-        providers: database.Providers
+        selectedElement: selectedProvider
+        providers: db.Providers
     }
     ContentView {
         id: view
-        providers: database.Providers
+        viewSelected: selectedView == 1
+        selectedElement: selectedProvider
+        providers: db.Providers
     }
     function mod(n, m) {
         return ((n % m) + m) % m;
@@ -21,24 +25,18 @@ Row {
         if (selectedView == 0) {
             if (event.key == Qt.Key_Right) {
                 selectedView = 1;
-                view.viewSelected = true
+                //view.viewSelected = true
-            }
+            } else if (event.key == Qt.Key_Down) {
-            sidebar.Keys.pressed(event);
+                selectedProvider = mod(selectedProvider + 1, db.Providers.length)
-
-            if (event.key == Qt.Key_Down) {
-                view.currentIndex = mod(view.currentIndex + 1, view.providers.length)
             } else if (event.key == Qt.Key_Up) {
-                view.currentIndex = mod(view.currentIndex - 1, view.providers.length)
+                selectedProvider = mod(selectedProvider - 1, db.Providers.length)
-            }
-
-            if (event.key == Qt.Key_Return) {
-                console.log("Enter pressed")
-                mainTabView.currentIndex = 1
-                parent.children[1].children[0].play("./test1.mkv")
-            }
             } else {
-            view.Keys.pressed(event);
+                return
             }
             event.accepted = true;
         }
+        else if (selectedView == 1) {
+            view.Keys.pressed(event);
+        }
+    }
 }

layouts/components/BrowserView/ContentView.qml

@@ -1,27 +1,24 @@
 import QtQuick 2.12
+import QtQuick.Layouts 1.12
 import QtQuick.Controls 1.4
 
 import Ikinuki.Client 1.0
 
 import "./ContentView"
 
-TabView {
+StackLayout {
     id: tabView
     property var providers
-    property bool viewSelected: false
+    property bool viewSelected
+    property int selectedElement
     state: viewSelected ? "selected" : "deselected"
     property int xSelect: 0
     property int ySelect: 0
-    //width: viewSelected ? parent.width * 0.95 : parent.width * 0.8
     width: parent.width * viewSelected ? 0.95 : 0.8
     height: parent.height
 
-    property var maxElements: providers.length
-
-    tabsVisible: false
     Repeater {
         model: providers
-        Tab {
         Rectangle {
             color: "#22282A"
             Row {
@@ -88,7 +85,6 @@ TabView {
             }
         }
     }
-    }
     states: [
         State {
             name: "deselected"
@@ -116,10 +112,8 @@ TabView {
     ]
 
     Keys.onPressed: (event)=> {
-        console.log(Qt.Key_Left);
         if (event.key == Qt.Key_Left) {
             if (xSelect == 0) {
-                viewSelected = false;
                 parent.selectedView = 0;
             } else {
                 xSelect--;
@@ -131,5 +125,6 @@ TabView {
         } else if (event.key == Qt.Key_Up) {
             ySelect--;
         }
+        event.accepted = true;
     }
 }

layouts/components/BrowserView/Sidebar.qml

@@ -7,14 +7,12 @@ import "./Sidebar"
 Rectangle {
     id: rect
     property var providers
-    property bool maximized: true
+    property bool maximized
-    property int selectedElement: 0
+    property int selectedElement
-    property var max_elements: providers.length
     width: parent.width * 0.2
     height: parent.height
     color: "#22282A"
     state: maximized ? "maximized" : "minimized"
-    //color: "#0a3d4a"
     Column {
         anchors.fill: parent
         Header {}
@@ -53,17 +51,4 @@ Rectangle {
             }
         }
     ]
-    function mod(n, m) {
-        return ((n % m) + m) % m;
-    }
-    Keys.onPressed: (event)=> {
-        // Handle scrolling
-        if (event.key == Qt.Key_Down) {
-            selectedElement = mod(selectedElement + 1, max_elements);
-        }
-        else if (event.key == Qt.Key_Up) {
-            selectedElement = mod(selectedElement - 1, max_elements);
-        }
-        event.accepted = true;
-    }
 }

layouts/ikinuki-default.qml

@@ -24,10 +24,16 @@ ApplicationWindow {
         BrowserView {
             id: browserView
             focus: true
+            db: database
         }
         PlayerView {
             id: playerView
-            anchors.fill: parent
+        }
+        Keys.onPressed: (event)=> {
+            if (event.key == Qt.Key_Return) {
+                currentIndex = 1
+                playerView.children[0].play("./test1.mkv")
+            }
         }
     }
 }