dominic/Tactility
1
0
Fork 0
mirror of https://github.com/ByteWelder/Tactility.git synced 2026-04-20 10:25:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for icon registration leak

Browse Source
This commit is contained in:
Ken Van Hoeylandt 2025-08-15 17:10:13 +02:00
parent e28be828da
commit e1bd49cbc0
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Tactility/Source/service/statusbar/Statusbar.cpp
View File

@ -130,20 +130,18 @@ static _Nullable const char* getPowerStatusIcon() {
class StatusbarService final : public Service { class StatusbarService final : public Service {
private:
Mutex mutex; Mutex mutex;
std::unique_ptr<Timer> updateTimer; std::unique_ptr<Timer> updateTimer;
int8_t gps_icon_id = lvgl::statusbar_icon_add(); int8_t gps_icon_id;
bool gps_last_state = false; bool gps_last_state = false;
int8_t wifi_icon_id = lvgl::statusbar_icon_add(); int8_t wifi_icon_id;
const char* wifi_last_icon = nullptr; const char* wifi_last_icon = nullptr;
int8_t sdcard_icon_id = lvgl::statusbar_icon_add(); int8_t sdcard_icon_id;
const char* sdcard_last_icon = nullptr; const char* sdcard_last_icon = nullptr;
int8_t power_icon_id = lvgl::statusbar_icon_add(); int8_t power_icon_id;
const char* power_last_icon = nullptr; const char* power_last_icon = nullptr;
std::unique_ptr<service::Paths> paths; std::unique_ptr<Paths> paths;
void lock() const { void lock() const {
mutex.lock(); mutex.lock();
@ -154,7 +152,7 @@ private:
} }
void updateGpsIcon() { void updateGpsIcon() {
auto gps_state = service::gps::findGpsService()->getState(); auto gps_state = gps::findGpsService()->getState();
bool show_icon = (gps_state == gps::State::OnPending) || (gps_state == gps::State::On); bool show_icon = (gps_state == gps::State::OnPending) || (gps_state == gps::State::On);
if (gps_last_state != show_icon) { if (gps_last_state != show_icon) {
if (show_icon) { if (show_icon) {
@ -199,7 +197,7 @@ private:
} }
void updateSdCardIcon() { void updateSdCardIcon() {
auto sdcard = tt::hal::getConfiguration()->sdcard; auto sdcard = hal::getConfiguration()->sdcard;
if (sdcard != nullptr) { if (sdcard != nullptr) {
auto state = sdcard->getState(); auto state = sdcard->getState();
if (state != hal::sdcard::SdCardDevice::State::Unknown) { if (state != hal::sdcard::SdCardDevice::State::Unknown) {
@ -229,10 +227,18 @@ private:
public: public:
~StatusbarService() final { StatusbarService() {
gps_icon_id = lvgl::statusbar_icon_add();
sdcard_icon_id = lvgl::statusbar_icon_add();
wifi_icon_id = lvgl::statusbar_icon_add();
power_icon_id = lvgl::statusbar_icon_add();
}
~StatusbarService() override {
lvgl::statusbar_icon_remove(wifi_icon_id); lvgl::statusbar_icon_remove(wifi_icon_id);
lvgl::statusbar_icon_remove(sdcard_icon_id); lvgl::statusbar_icon_remove(sdcard_icon_id);
lvgl::statusbar_icon_remove(power_icon_id); lvgl::statusbar_icon_remove(power_icon_id);
lvgl::statusbar_icon_remove(gps_icon_id);
} }
void onStart(ServiceContext& serviceContext) override { void onStart(ServiceContext& serviceContext) override {
@ -245,7 +251,7 @@ public:
assert(service); assert(service);
onUpdate(service); onUpdate(service);
updateTimer = std::make_unique<Timer>(Timer::Type::Periodic, [service]() { updateTimer = std::make_unique<Timer>(Timer::Type::Periodic, [service] {
onUpdate(service); onUpdate(service);
}); });