Merge branch 'master' of github.com:Feqzz/qZoom-Client

Stykk-Gruppen · Aug 4, 2020 · ca1c3db · ca1c3db
2 parents 5b5e684 + 06364d5
commit ca1c3db
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/components/Header.qml b/components/Header.qml
@@ -1,11 +1,14 @@
 import QtQuick 2.0
 
+
 Rectangle {
     //color: parent.color
     width: parent.width
-    height: 150
+    height: Math.min(parent.height / 5, 150)
+
 
     Column {
+        height: parent.height
         spacing: 50
         anchors.fill: parent
         anchors.horizontalCenter: parent.horizontalCenter
@@ -23,6 +26,7 @@ Rectangle {
             height: 5
             width: parent.width
             color: "#5CBB5C"
+            anchors.verticalCenter: parent.bottom
         }
     }
 

diff --git a/view/main.qml b/view/main.qml
@@ -10,8 +10,8 @@ ApplicationWindow {
     visible: true
     width: 1280
     height: 784
-    minimumHeight: 400
-    minimumWidth: 400
+    minimumHeight: 600
+    minimumWidth: 600
     title: qsTr("qZoom")
 
     Settings {