ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix weather view crashing with Qt 5.15

Browse Source
This commit is contained in:
Michael Zanetti 2020-09-14 13:48:05 +02:00
parent e3968062b4
commit 451b9f8ff8
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nymea-app/ui/customviews/WeatherView.qml
View File

@ -66,10 +66,13 @@ CustomViewBase {
RowLayout { RowLayout {
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: mainImageSize
property int mainImageSize: app.iconSize * 2
Item { Item {
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredWidth: (parent.width - mainImage.width) / 2 Layout.preferredWidth: (parent.width - parent.mainImageSize) / 2
GridLayout { GridLayout {
anchors.centerIn: parent anchors.centerIn: parent
@ -98,20 +101,19 @@ CustomViewBase {
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
} }
} }
} }
ColorIcon { ColorIcon {
id: mainImage id: mainImage
Layout.preferredWidth: app.largeFont * 4 Layout.preferredWidth: parent.mainImageSize
Layout.preferredHeight: app.largeFont * 4 Layout.preferredHeight: width
name: weatherConditionState ? "../images/weathericons/weather-" + weatherConditionState.value + ".svg" : "" name: weatherConditionState ? "../images/weathericons/weather-" + weatherConditionState.value + ".svg" : ""
color: "white" color: app.foregroundColor
} }
Item { Item {
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredWidth: (parent.width - mainImage.width) / 2 Layout.preferredWidth: (parent.width - parent.mainImageSize) / 2
GridLayout { GridLayout {
columns: 2 columns: 2
anchors.centerIn: parent anchors.centerIn: parent