From 994e426d1e465c02facd369e33ae4df9884ab48e Mon Sep 17 00:00:00 2001 From: "E.T" Date: Thu, 8 Feb 2024 00:52:12 +0100 Subject: [PATCH] Brightness settings fixes (#1863) * Brightness settings fixes - Statusbar toggle now updated when changing in settings page - Annoying message boxes removed - SystemView (aka whole screen) is now refreshed after toggling from status * Format --- firmware/application/apps/ui_settings.cpp | 6 ++---- firmware/application/ui_navigation.cpp | 18 ++++-------------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/firmware/application/apps/ui_settings.cpp b/firmware/application/apps/ui_settings.cpp index 7d8dfc53..d0668342 100644 --- a/firmware/application/apps/ui_settings.cpp +++ b/firmware/application/apps/ui_settings.cpp @@ -763,12 +763,10 @@ SetFakeBrightnessView::SetFakeBrightnessView(NavigationView& nav) { field_fake_brightness.set_by_value(pmem::fake_brightness_level()); checkbox_brightness_switch.set_value(pmem::apply_fake_brightness()); - checkbox_brightness_switch.on_select = [this](Checkbox&, bool v) { - pmem::set_apply_fake_brightness(v); - }; - button_save.on_select = [&nav, this](Button&) { + pmem::set_apply_fake_brightness(checkbox_brightness_switch.value()); pmem::set_fake_brightness_level(field_fake_brightness.selected_index_value()); + send_system_refresh(); nav.pop(); }; diff --git a/firmware/application/ui_navigation.cpp b/firmware/application/ui_navigation.cpp index d517ba10..59cd4bb2 100644 --- a/firmware/application/ui_navigation.cpp +++ b/firmware/application/ui_navigation.cpp @@ -330,21 +330,8 @@ SystemStatusView::SystemStatusView( toggle_fake_brightness.on_change = [this, &nav](bool v) { set_dirty(); pmem::set_apply_fake_brightness(v); - if (nav.is_valid() && v) { - nav.display_modal( - "Brightness", - "You have enabled brightness\n" - "adjustment. Performance\n" - "will be impacted slightly."); - - // TODO: refresh interface to prevent reboot requirement - // TODO: increase performance - } else if (!v) { - nav.display_modal( - "Brightness", - "Brightness adjust disabled."); - } refresh(); + parent()->set_dirty(); // The parent of NavigationView shal be the SystemView }; button_bias_tee.on_select = [this](ImageButton&) { @@ -413,6 +400,9 @@ void SystemStatusView::refresh() { button_converter.set_bitmap(pmem::config_updown_converter() ? &bitmap_icon_downconvert : &bitmap_icon_upconvert); button_converter.set_foreground(pmem::config_converter() ? Color::red() : Color::light_grey()); + // Brightness + toggle_fake_brightness.set_value(pmem::apply_fake_brightness()); + set_dirty(); }