From 36839dd417c66a1db4fd37e0fbc76c17b6b0379b Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Mon, 1 Jun 2020 16:02:20 +0200
Subject: [PATCH] [Horus] Gauge percent was not vertically centered

---
 radio/src/gui/480x272/widgets/gauge.cpp    | 6 +++---
 radio/src/gui/480x272/widgets/modelbmp.cpp | 2 +-
 radio/src/gui/480x272/widgets/outputs.cpp  | 2 +-
 radio/src/gui/480x272/widgets/text.cpp     | 2 +-
 radio/src/gui/480x272/widgets/timer.cpp    | 2 +-
 radio/src/gui/480x272/widgets/value.cpp    | 2 +-
 radio/src/lua/widgets.cpp                  | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/radio/src/gui/480x272/widgets/gauge.cpp b/radio/src/gui/480x272/widgets/gauge.cpp
index 099920abc..2558f8319 100644
--- a/radio/src/gui/480x272/widgets/gauge.cpp
+++ b/radio/src/gui/480x272/widgets/gauge.cpp
@@ -28,7 +28,7 @@ class GaugeWidget: public Widget
     {
     }
 
-    virtual void refresh();
+    void refresh() override;
 
     static const ZoneOption options[];
 };
@@ -38,7 +38,7 @@ const ZoneOption GaugeWidget::options[] = {
   { STR_MIN, ZoneOption::Integer, OPTION_VALUE_SIGNED(-RESX), OPTION_VALUE_SIGNED(-RESX), OPTION_VALUE_SIGNED(RESX) },
   { STR_MAX, ZoneOption::Integer, OPTION_VALUE_SIGNED(RESX), OPTION_VALUE_SIGNED(-RESX), OPTION_VALUE_SIGNED(RESX) },
   { STR_COLOR, ZoneOption::Color, OPTION_VALUE_UNSIGNED(RED) },
-  { NULL, ZoneOption::Bool }
+  { nullptr, ZoneOption::Bool }
 };
 
 void GaugeWidget::refresh()
@@ -64,7 +64,7 @@ void GaugeWidget::refresh()
   // Gauge
   lcdSetColor(color);
   lcdDrawSolidFilledRect(zone.x, zone.y + 16, zone.w, 16, TEXT_INVERTED_COLOR);
-  lcdDrawNumber(zone.x+zone.w/2, zone.y + 17, percent, SMLSIZE | CUSTOM_COLOR | CENTERED, 0, NULL, "%");
+  lcdDrawNumber(zone.x + zone.w/2, zone.y + 16, percent, SMLSIZE | CUSTOM_COLOR | CENTERED, 0, nullptr, "%");
   lcd->invertRect(zone.x + w, zone.y + 16, zone.w - w, 16, CUSTOM_COLOR);
 }
 
diff --git a/radio/src/gui/480x272/widgets/modelbmp.cpp b/radio/src/gui/480x272/widgets/modelbmp.cpp
index 131d59b2b..09e632ab3 100644
--- a/radio/src/gui/480x272/widgets/modelbmp.cpp
+++ b/radio/src/gui/480x272/widgets/modelbmp.cpp
@@ -63,7 +63,7 @@ class ModelBitmapWidget: public Widget
       }
     }
 
-    virtual void refresh()
+    void refresh() override
     {
       uint32_t new_hash = hash(g_model.header.bitmap, sizeof(g_model.header.bitmap));
       new_hash ^= hash(g_model.header.name, sizeof(g_model.header.name));
diff --git a/radio/src/gui/480x272/widgets/outputs.cpp b/radio/src/gui/480x272/widgets/outputs.cpp
index 0628b5faa..467657519 100644
--- a/radio/src/gui/480x272/widgets/outputs.cpp
+++ b/radio/src/gui/480x272/widgets/outputs.cpp
@@ -33,7 +33,7 @@ class OutputsWidget: public Widget
     {
     }
 
-    virtual void refresh();
+    void refresh() override;
 
     uint8_t drawChannels(const uint16_t & x, const uint16_t & y, const uint16_t & w, const uint16_t & h, const uint8_t & firstChan, const bool & bg_shown, const uint16_t & bg_color)
     {
diff --git a/radio/src/gui/480x272/widgets/text.cpp b/radio/src/gui/480x272/widgets/text.cpp
index ce18b7b26..f297798eb 100644
--- a/radio/src/gui/480x272/widgets/text.cpp
+++ b/radio/src/gui/480x272/widgets/text.cpp
@@ -30,7 +30,7 @@ class TextWidget: public Widget
     {
     }
 
-    virtual void refresh();
+    void refresh() override;
 
     static const ZoneOption options[];
 };
diff --git a/radio/src/gui/480x272/widgets/timer.cpp b/radio/src/gui/480x272/widgets/timer.cpp
index 424db91e7..58c53c4d4 100644
--- a/radio/src/gui/480x272/widgets/timer.cpp
+++ b/radio/src/gui/480x272/widgets/timer.cpp
@@ -28,7 +28,7 @@ class TimerWidget: public Widget
     {
     }
 
-    virtual void refresh();
+    void refresh() override;
 
     static const ZoneOption options[];
 };
diff --git a/radio/src/gui/480x272/widgets/value.cpp b/radio/src/gui/480x272/widgets/value.cpp
index 96fc885db..c7fe6ce99 100644
--- a/radio/src/gui/480x272/widgets/value.cpp
+++ b/radio/src/gui/480x272/widgets/value.cpp
@@ -28,7 +28,7 @@ class ValueWidget: public Widget
     {
     }
 
-    virtual void refresh();
+    void refresh() override;
 
     static const ZoneOption options[];
 };
diff --git a/radio/src/lua/widgets.cpp b/radio/src/lua/widgets.cpp
index 165d95eff..4ab6b967e 100644
--- a/radio/src/lua/widgets.cpp
+++ b/radio/src/lua/widgets.cpp
@@ -265,7 +265,7 @@ class LuaWidget: public Widget
 
     virtual void update();
 
-    virtual void refresh();
+    void refresh() override;
 
     virtual void background();