summaryrefslogtreecommitdiff
path: root/src/displayapp/screens/settings/QuickSettings.cpp
diff options
context:
space:
mode:
authorJean-François Milants <jf@codingfield.com>2022-02-13 11:23:05 +0100
committerJean-François Milants <jf@codingfield.com>2022-02-13 11:23:05 +0100
commit87d882b151acc7ef60fdb1a957649faf39e737c1 (patch)
tree7d7586810c062d8fac37f16f208f6da77757a3ba /src/displayapp/screens/settings/QuickSettings.cpp
parentd967efa19710f85cee846c59adbbe07d2a2189dc (diff)
parent947ece0bc9ad90dd4c1fcd5875594a4a48eddd56 (diff)
Merge branch 'statusBarTimeFormat' of https://github.com/mruss77/InfiniTime into mruss77-statusBarTimeFormat
# Conflicts: # src/components/datetime/DateTimeController.cpp
Diffstat (limited to 'src/displayapp/screens/settings/QuickSettings.cpp')
-rw-r--r--src/displayapp/screens/settings/QuickSettings.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/displayapp/screens/settings/QuickSettings.cpp b/src/displayapp/screens/settings/QuickSettings.cpp
index 5d3a9834..cd56c145 100644
--- a/src/displayapp/screens/settings/QuickSettings.cpp
+++ b/src/displayapp/screens/settings/QuickSettings.cpp
@@ -35,7 +35,7 @@ QuickSettings::QuickSettings(Pinetime::Applications::DisplayApp* app,
// Time
label_time = lv_label_create(lv_scr_act(), nullptr);
- lv_label_set_text_fmt(label_time, "%02i:%02i", dateTimeController.Hours(), dateTimeController.Minutes());
+ lv_label_set_text(label_time, dateTimeController.FormattedTime().c_str());
lv_label_set_align(label_time, LV_LABEL_ALIGN_CENTER);
lv_obj_align(label_time, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 0, 0);
@@ -123,7 +123,7 @@ QuickSettings::~QuickSettings() {
}
void QuickSettings::UpdateScreen() {
- lv_label_set_text_fmt(label_time, "%02i:%02i", dateTimeController.Hours(), dateTimeController.Minutes());
+ lv_label_set_text(label_time, dateTimeController.FormattedTime().c_str());
lv_label_set_text(batteryIcon, BatteryIcon::GetBatteryIcon(batteryController.PercentRemaining()));
}