Fixed session button order

Stykk-Gruppen · Aug 4, 2020 · a67c9d3 · a67c9d3
1 parent 7011577
commit a67c9d3
Showing 1 changed file with 60 additions and 40 deletions.
diff --git a/components/TaskBar.qml b/components/TaskBar.qml
@@ -10,45 +10,14 @@ Rectangle {
     width: parent.width
 
     Row {
-        anchors.horizontalCenter: parent.horizontalCenter
         anchors.verticalCenter: parent.verticalCenter
         spacing: 32
-
-        /*
-        C.PushButton {
-            id: changeAudioInputButton
-            text: "Change Audio"
-            font.pixelSize: 32
-            property var toggled: true
-            onClicked: {
-                cb.visible = !cb.visible
-            }
-
-            ComboBox {
-                id: cb
-                width: 200
-                visible: false
-                model: ListModel {
-                    id: audioInputModel
-                    function getAudioTypes() {
-                        var inputList = streamHandler.getAudioInputDevices()
-                        clear()
-                        for (var title in inputList) {
-                            append({text: inputList[title]})
-                        }
-                    }
-                }
-                onActivated: {
-                    console.log("switched Audio Input Device to: " + currentText)
-                    streamHandler.changeAudioInputDevice(currentText);
-                    cb.visible = false
-                }
-            }
-        }
-        */
+        anchors.left: parent.left
+        layoutDirection: Qt.LeftToRight
+        anchors.leftMargin: 32
 
         Rectangle {
-            id: settingsRectangle
+            id: roomInfoRectangle
             color: "#5CBB5C"
             implicitHeight: 30
             implicitWidth: 30
@@ -58,18 +27,18 @@ Rectangle {
                 anchors.verticalCenter: parent.verticalCenter
                 height: 20
                 width: 20
-                source: "../img/settings-icon.png"
+                source: "../img/info-icon.png"
             }
             MouseArea {
                 hoverEnabled: true
                 anchors.fill: parent
                 cursorShape: Qt.PointingHandCursor
-                onClicked: showSettings()
+                onClicked: roomInfo.open()
             }
         }
 
         Rectangle {
-            id: roomInfoRectangle
+            id: settingsRectangle
             color: "#5CBB5C"
             implicitHeight: 30
             implicitWidth: 30
@@ -79,15 +48,56 @@ Rectangle {
                 anchors.verticalCenter: parent.verticalCenter
                 height: 20
                 width: 20
-                source: "../img/info-icon.png"
+                source: "../img/settings-icon.png"
             }
             MouseArea {
                 hoverEnabled: true
                 anchors.fill: parent
                 cursorShape: Qt.PointingHandCursor
-                onClicked: roomInfo.open()
+                onClicked: showSettings()
+            }
+        }
+    }
+
+    Row {
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.verticalCenter: parent.verticalCenter
+        spacing: 32
+
+        /*
+        C.PushButton {
+            id: changeAudioInputButton
+            text: "Change Audio"
+            font.pixelSize: 32
+            property var toggled: true
+            onClicked: {
+                cb.visible = !cb.visible
+            }
+
+            ComboBox {
+                id: cb
+                width: 200
+                visible: false
+                model: ListModel {
+                    id: audioInputModel
+                    function getAudioTypes() {
+                        var inputList = streamHandler.getAudioInputDevices()
+                        clear()
+                        for (var title in inputList) {
+                            append({text: inputList[title]})
+                        }
+                    }
+                }
+                onActivated: {
+                    console.log("switched Audio Input Device to: " + currentText)
+                    streamHandler.changeAudioInputDevice(currentText);
+                    cb.visible = false
+                }
             }
         }
+        */
+
+
 
         /*
         C.PushButton {
@@ -181,6 +191,16 @@ Rectangle {
             }
         }
 
+
+    }
+
+    Row {
+        anchors.verticalCenter: parent.verticalCenter
+        spacing: 32
+        anchors.right: parent.right
+        layoutDirection: Qt.RightToLeft
+        anchors.rightMargin: 32
+
         C.PushButton {
             id: leaveSessionButton
             text: "Leave Session"