diff options
| author | JF <jf@codingfield.com> | 2020-10-27 21:55:18 +0100 |
|---|---|---|
| committer | JF <jf@codingfield.com> | 2020-10-27 21:55:18 +0100 |
| commit | 7de43a16608e599369867cb3cfa7d5776a5b6380 (patch) | |
| tree | 1750edfed02f547102e468eca485caab3b08e98d /src/displayapp/screens/Gauge.cpp | |
| parent | 5983e33b8d7702800dc91a3229b9a7cee75eb006 (diff) | |
| parent | c5bf09d21b2ed8e2435ec625e351594f58713924 (diff) | |
Fix conflicts
Diffstat (limited to 'src/displayapp/screens/Gauge.cpp')
| -rw-r--r-- | src/displayapp/screens/Gauge.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/displayapp/screens/Gauge.cpp b/src/displayapp/screens/Gauge.cpp index fd905231..81c283ca 100644 --- a/src/displayapp/screens/Gauge.cpp +++ b/src/displayapp/screens/Gauge.cpp @@ -25,11 +25,11 @@ Gauge::Gauge(Pinetime::Applications::DisplayApp *app) : Screen(app) { needle_colors[0] = LV_COLOR_ORANGE; /*Create a gauge*/ - gauge1 = lv_gauge_create(lv_scr_act(), NULL); + gauge1 = lv_gauge_create(lv_scr_act(), nullptr); lv_gauge_set_style(gauge1, LV_GAUGE_STYLE_MAIN, &style); lv_gauge_set_needle_count(gauge1, 1, needle_colors); lv_obj_set_size(gauge1, 180, 180); - lv_obj_align(gauge1, NULL, LV_ALIGN_CENTER, 0, 0); + lv_obj_align(gauge1, nullptr, LV_ALIGN_CENTER, 0, 0); lv_gauge_set_scale(gauge1, 360, 60, 0); lv_gauge_set_range(gauge1, 0, 59); |