From 264b5bed43d5a703df20c1e305f394a15e9d2484 Mon Sep 17 00:00:00 2001 From: Victor Kareh Date: Sun, 14 Jan 2024 16:37:26 -0500 Subject: [PATCH] WatchFacePineTimeStyle: Fix conditional in weather display (#1965) Since returning a valid weather is always considered an updated value, if the current weather is empty, the face will attempt to display the temperature and icon as empty values, rather than clearing the labels. --- src/displayapp/screens/WatchFacePineTimeStyle.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/displayapp/screens/WatchFacePineTimeStyle.cpp b/src/displayapp/screens/WatchFacePineTimeStyle.cpp index 296323d3..e56031f7 100644 --- a/src/displayapp/screens/WatchFacePineTimeStyle.cpp +++ b/src/displayapp/screens/WatchFacePineTimeStyle.cpp @@ -540,7 +540,6 @@ void WatchFacePineTimeStyle::Refresh() { } currentWeather = weatherService.Current(); - if (currentWeather.IsUpdated()) { auto optCurrentWeather = currentWeather.Get(); if (optCurrentWeather) { @@ -551,12 +550,10 @@ void WatchFacePineTimeStyle::Refresh() { temp = temp / 100 + (temp % 100 >= 50 ? 1 : 0); lv_label_set_text_fmt(temperature, "%d°", temp); lv_label_set_text(weatherIcon, Symbols::GetSymbol(optCurrentWeather->iconId)); - lv_obj_realign(temperature); - lv_obj_realign(weatherIcon); + } else { + lv_label_set_text(temperature, "--"); + lv_label_set_text(weatherIcon, Symbols::ban); } - } else { - lv_label_set_text(temperature, "--"); - lv_label_set_text(weatherIcon, Symbols::ban); lv_obj_realign(temperature); lv_obj_realign(weatherIcon); }