From 77a939a4dbfced83f0749037b105d79c0494dba4 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Mon, 28 Oct 2019 17:19:56 +0100 Subject: [PATCH] Fix spacing of shutter controls --- nymea-app/ui/components/ShutterControls.qml | 2 -- nymea-app/ui/devicelistpages/ClosablesDeviceListPage.qml | 1 + nymea-app/ui/devicepages/AwningDevicePage.qml | 1 + nymea-app/ui/devicepages/GarageGateDevicePage.qml | 1 + nymea-app/ui/devicepages/ShutterDevicePage.qml | 1 + nymea-app/ui/experiences/garagegates/Main.qml | 1 + 6 files changed, 5 insertions(+), 2 deletions(-) diff --git a/nymea-app/ui/components/ShutterControls.qml b/nymea-app/ui/components/ShutterControls.qml index bb62ac7d..d83f4e52 100644 --- a/nymea-app/ui/components/ShutterControls.qml +++ b/nymea-app/ui/components/ShutterControls.qml @@ -6,8 +6,6 @@ import Nymea 1.0 RowLayout { id: root - spacing: (parent.width - app.iconSize*2*children.length) / (children.length - 1) -// implicitWidth: app.iconSize * 2 * children.length + spacing * (children.length - 1) implicitWidth: childrenRect.width property var device: null diff --git a/nymea-app/ui/devicelistpages/ClosablesDeviceListPage.qml b/nymea-app/ui/devicelistpages/ClosablesDeviceListPage.qml index 892043a6..c780fa41 100644 --- a/nymea-app/ui/devicelistpages/ClosablesDeviceListPage.qml +++ b/nymea-app/ui/devicelistpages/ClosablesDeviceListPage.qml @@ -123,6 +123,7 @@ DeviceListPageBase { Item { Layout.preferredWidth: shutterControls.implicitWidth Layout.preferredHeight: app.iconSize * 2 + Rectangle { anchors.fill: parent; color: "green"; opacity: .3 } ShutterControls { id: shutterControls height: parent.height diff --git a/nymea-app/ui/devicepages/AwningDevicePage.qml b/nymea-app/ui/devicepages/AwningDevicePage.qml index 444c46ce..4f2fee9f 100644 --- a/nymea-app/ui/devicepages/AwningDevicePage.qml +++ b/nymea-app/ui/devicepages/AwningDevicePage.qml @@ -74,6 +74,7 @@ DevicePageBase { device: root.device invert: true anchors.horizontalCenter: parent.horizontalCenter + spacing: (parent.width - app.iconSize*2*children.length) / (children.length - 1) } } diff --git a/nymea-app/ui/devicepages/GarageGateDevicePage.qml b/nymea-app/ui/devicepages/GarageGateDevicePage.qml index ca628d82..c2d814f7 100644 --- a/nymea-app/ui/devicepages/GarageGateDevicePage.qml +++ b/nymea-app/ui/devicepages/GarageGateDevicePage.qml @@ -84,6 +84,7 @@ DevicePageBase { id: shutterControls device: root.device anchors.centerIn: parent + spacing: (parent.width - app.iconSize*2*children.length) / (children.length - 1) ItemDelegate { Layout.preferredWidth: app.iconSize * 2 diff --git a/nymea-app/ui/devicepages/ShutterDevicePage.qml b/nymea-app/ui/devicepages/ShutterDevicePage.qml index 8813a5fb..312bca42 100644 --- a/nymea-app/ui/devicepages/ShutterDevicePage.qml +++ b/nymea-app/ui/devicepages/ShutterDevicePage.qml @@ -72,6 +72,7 @@ DevicePageBase { id: shutterControls device: root.device anchors.horizontalCenter: parent.horizontalCenter + spacing: (parent.width - app.iconSize*2*children.length) / (children.length - 1) } } } diff --git a/nymea-app/ui/experiences/garagegates/Main.qml b/nymea-app/ui/experiences/garagegates/Main.qml index 73b62137..49ca9fef 100644 --- a/nymea-app/ui/experiences/garagegates/Main.qml +++ b/nymea-app/ui/experiences/garagegates/Main.qml @@ -82,6 +82,7 @@ Item { ShutterControls { id: controls device: garageGateView.device + spacing: (parent.width - app.iconSize*2*children.length) / (children.length - 1) } } }