diff --git a/nymea-app/ui/devicepages/ThermostatDevicePage.qml b/nymea-app/ui/devicepages/ThermostatDevicePage.qml index 9334e7a3..ddfc4c38 100644 --- a/nymea-app/ui/devicepages/ThermostatDevicePage.qml +++ b/nymea-app/ui/devicepages/ThermostatDevicePage.qml @@ -76,6 +76,7 @@ ThingPageBase { Layout.margins: Style.bigMargins size: Style.largeIconSize imageSource: "thermostat/heating" + color: Style.white backgroundColor: app.interfaceToColor("heating") visible: root.boostState busy: actionQueue.pendingValue ? actionQueue.pendingValue : (root.boostState && root.boostState.value === true) diff --git a/nymea-app/ui/mainviews/EnergyView.qml b/nymea-app/ui/mainviews/EnergyView.qml index 2e869d45..e77c030d 100644 --- a/nymea-app/ui/mainviews/EnergyView.qml +++ b/nymea-app/ui/mainviews/EnergyView.qml @@ -186,7 +186,7 @@ MainViewBase { anchors.centerIn: parent width: parent.width - app.margins * 2 visible: !engine.thingManager.fetchingData && (!engine.jsonRpcClient.experiences.hasOwnProperty("Energy") || engine.jsonRpcClient.experiences["Energy"] <= "0.1") - title: qsTr("Energy plugin not installed installed.") + title: qsTr("Energy plugin not installed.") text: qsTr("This %1 system does not have the energy extensions installed.").arg(Configuration.systemName) imageSource: "../images/smartmeter.svg" buttonText: qsTr("Install energy plugin") diff --git a/nymea-app/ui/mainviews/energy/ConsumersPieChart.qml b/nymea-app/ui/mainviews/energy/ConsumersPieChart.qml index 9ab48e27..ea3c1aa9 100644 --- a/nymea-app/ui/mainviews/energy/ConsumersPieChart.qml +++ b/nymea-app/ui/mainviews/energy/ConsumersPieChart.qml @@ -56,7 +56,10 @@ ChartView { } function updateConsumers() { + root.animationOptions = ChartView.NoAnimation + print("clearing consumers pie chart", consumersBalanceSeries.count) consumersBalanceSeries.clear(); + print("cleared consumers pie chart") if (engine.thingManager.fetchingData) { return; @@ -81,6 +84,10 @@ ChartView { d.unknownSlice.color = Style.gray d.thingsColorMap = colorMap + + root.animationOptions = Qt.binding(function() { + return Qt.application.active ? NymeaUtils.chartsAnimationOptions : ChartView.NoAnimation + }) } PieSeries {