From da9d5492286f87ace98b75dbfe6fd621503f4392 Mon Sep 17 00:00:00 2001 From: Elias Steurer Date: Sun, 6 Oct 2019 09:12:28 +0200 Subject: [PATCH] Fix controls --- ScreenPlay/qml/Monitors/DefaultVideoControls.qml | 15 ++++++++++----- ScreenPlay/qml/Monitors/Monitors.qml | 4 +++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ScreenPlay/qml/Monitors/DefaultVideoControls.qml b/ScreenPlay/qml/Monitors/DefaultVideoControls.qml index 1825ad7c..e195441a 100644 --- a/ScreenPlay/qml/Monitors/DefaultVideoControls.qml +++ b/ScreenPlay/qml/Monitors/DefaultVideoControls.qml @@ -13,8 +13,14 @@ ColumnLayout { spacing: 20 state: "hidden" clip: true - anchors.rightMargin: 10 - anchors.leftMargin: 10 + anchors { + right: parent.right + rightMargin: 20 + left: parent.left + leftMargin: 20 + } + + property int activeMonitorIndex SP.Slider { headline: qsTr("Volume") @@ -38,7 +44,7 @@ ColumnLayout { height: 50 Layout.fillWidth: true spacing: 5 - + Text { id: txtComboBoxFillMode text: qsTr("Fill Mode") @@ -57,7 +63,7 @@ ColumnLayout { activeMonitorIndex, "fillmode", settingsComboBox.currentText) } - + model: ListModel { ListElement { text: "Stretch" @@ -110,5 +116,4 @@ ColumnLayout { } } ] - } diff --git a/ScreenPlay/qml/Monitors/Monitors.qml b/ScreenPlay/qml/Monitors/Monitors.qml index 4b311bd5..b2fdae37 100644 --- a/ScreenPlay/qml/Monitors/Monitors.qml +++ b/ScreenPlay/qml/Monitors/Monitors.qml @@ -149,8 +149,10 @@ Item { } } } + DefaultVideoControls { id: videoControlWrapper + activeMonitorIndex: monitors.activeMonitorIndex anchors { top: parent.top topMargin: 60 @@ -204,7 +206,7 @@ Item { PropertyChanges { target: customPropertiesGridView opacity: 0 - z:0 + z:-1 anchors.topMargin: -100 } }