summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichele Bini <michele.bini@gmail.com>2022-06-07 16:14:21 (GMT)
committerMichele Bini <michele.bini@gmail.com>2022-06-07 17:05:42 (GMT)
commitb6a36b7a67bcda6956edd56d01001ec51ab26bca (patch)
tree7cbc38d6331f4bb43ab71cbadda1cb6ddde86a35
parent46588bac5eda62efa3d6ac96178128ad6fdb9366 (diff)
Inline BatteryIcon::GetObject
-rw-r--r--src/displayapp/screens/BatteryIcon.cpp4
-rw-r--r--src/displayapp/screens/BatteryIcon.h5
2 files changed, 4 insertions, 5 deletions
diff --git a/src/displayapp/screens/BatteryIcon.cpp b/src/displayapp/screens/BatteryIcon.cpp
index 2fe7c25..4c8c2b2 100644
--- a/src/displayapp/screens/BatteryIcon.cpp
+++ b/src/displayapp/screens/BatteryIcon.cpp
@@ -16,10 +16,6 @@ void BatteryIcon::Create(lv_obj_t* parent) {
lv_obj_set_style_local_radius(batteryJuice, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, 0);
}
-lv_obj_t* BatteryIcon::GetObject() {
- return batteryImg;
-}
-
void BatteryIcon::SetBatteryPercentage(uint8_t percentage) {
lv_obj_set_height(batteryJuice, percentage * 14 / 100);
lv_obj_realign(batteryJuice);
diff --git a/src/displayapp/screens/BatteryIcon.h b/src/displayapp/screens/BatteryIcon.h
index 81f94ac..2f76466 100644
--- a/src/displayapp/screens/BatteryIcon.h
+++ b/src/displayapp/screens/BatteryIcon.h
@@ -11,10 +11,13 @@ namespace Pinetime {
void SetColor(lv_color_t);
void SetBatteryPercentage(uint8_t percentage);
- lv_obj_t* GetObject();
+ inline lv_obj_t* GetObject() {
+ return batteryImg;
+ }
static const char* GetUnknownIcon();
static const char* GetPlugIcon(bool isCharging);
+
private:
lv_obj_t* batteryImg;
lv_obj_t* batteryJuice;