From 89c6e868a160380b2b295fb3c3ac1a618c6a7b73 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Wed, 19 Feb 2020 12:50:47 +0100 Subject: [PATCH] Reduce minimum tile size to support 2 columns on most devices --- nymea-app/ui/Nymea.qml | 2 +- nymea-app/ui/mainviews/DevicesPage.qml | 3 +-- nymea-app/ui/mainviews/FavoritesView.qml | 3 +-- nymea-app/ui/mainviews/GroupsView.qml | 4 ++-- nymea-app/ui/mainviews/ScenesView.qml | 3 +-- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/nymea-app/ui/Nymea.qml b/nymea-app/ui/Nymea.qml index d46ee37e..3c44f655 100644 --- a/nymea-app/ui/Nymea.qml +++ b/nymea-app/ui/Nymea.qml @@ -41,7 +41,7 @@ ApplicationWindow { visible: true width: 360 height: 580 - minimumWidth: 360 + minimumWidth: 350 minimumHeight: 480 visibility: kioskMode ? ApplicationWindow.FullScreen : settings.viewMode color: Material.background diff --git a/nymea-app/ui/mainviews/DevicesPage.qml b/nymea-app/ui/mainviews/DevicesPage.qml index 2bb8d37d..41db9198 100644 --- a/nymea-app/ui/mainviews/DevicesPage.qml +++ b/nymea-app/ui/mainviews/DevicesPage.qml @@ -49,8 +49,7 @@ MouseArea { anchors.fill: parent anchors.margins: app.margins / 2 - readonly property int minTileWidth: 180 - readonly property int minTileHeight: 240 + readonly property int minTileWidth: 172 readonly property int tilesPerRow: root.width / minTileWidth cellWidth: width / tilesPerRow diff --git a/nymea-app/ui/mainviews/FavoritesView.qml b/nymea-app/ui/mainviews/FavoritesView.qml index 6e7ddb6a..9e87aff7 100644 --- a/nymea-app/ui/mainviews/FavoritesView.qml +++ b/nymea-app/ui/mainviews/FavoritesView.qml @@ -56,8 +56,7 @@ MouseArea { id: gridView anchors.fill: parent anchors.margins: app.margins / 2 - readonly property int minTileWidth: 180 - readonly property int minTileHeight: 240 + readonly property int minTileWidth: 172 readonly property int tilesPerRow: root.width / minTileWidth cellWidth: gridView.width / tilesPerRow diff --git a/nymea-app/ui/mainviews/GroupsView.qml b/nymea-app/ui/mainviews/GroupsView.qml index ed52b095..b2b99853 100644 --- a/nymea-app/ui/mainviews/GroupsView.qml +++ b/nymea-app/ui/mainviews/GroupsView.qml @@ -48,8 +48,7 @@ MouseArea { anchors.margins: app.margins / 2 - readonly property int minTileWidth: 180 - readonly property int minTileHeight: 180 + readonly property int minTileWidth: 172 readonly property int tilesPerRow: root.width / minTileWidth model: TagListModel { @@ -409,6 +408,7 @@ MouseArea { id: mediaControllerDelegate MediaControls { property var devices: null + iconSize: app.iconSize DevicesProxy { id: mediaControllers engine: _engine diff --git a/nymea-app/ui/mainviews/ScenesView.qml b/nymea-app/ui/mainviews/ScenesView.qml index 9baa2d53..a4b09e2a 100644 --- a/nymea-app/ui/mainviews/ScenesView.qml +++ b/nymea-app/ui/mainviews/ScenesView.qml @@ -49,8 +49,7 @@ MouseArea { anchors.fill: parent anchors.margins: app.margins / 2 - readonly property int minTileWidth: 180 - readonly property int minTileHeight: 180 + readonly property int minTileWidth: 172 readonly property int tilesPerRow: root.width / minTileWidth model: RulesFilterModel {