From b7e5bedf4ba9ceee104330779210c35dbd46dfd9 Mon Sep 17 00:00:00 2001 From: theHallwayThatBringMePassion Date: Thu, 8 Feb 2024 10:09:00 +0800 Subject: [PATCH] Revert "Brightness settings fixes" (#1865) This reverts commit 994e426d1e465c02facd369e33ae4df9884ab48e. --- firmware/application/apps/ui_settings.cpp | 6 ++++-- firmware/application/ui_navigation.cpp | 18 ++++++++++++++---- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/firmware/application/apps/ui_settings.cpp b/firmware/application/apps/ui_settings.cpp index d0668342..7d8dfc53 100644 --- a/firmware/application/apps/ui_settings.cpp +++ b/firmware/application/apps/ui_settings.cpp @@ -763,10 +763,12 @@ 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 59cd4bb2..d517ba10 100644 --- a/firmware/application/ui_navigation.cpp +++ b/firmware/application/ui_navigation.cpp @@ -330,8 +330,21 @@ 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&) { @@ -400,9 +413,6 @@ 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(); }