Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2024-10-01 01:26:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Brightness settings fixes 2.0 (#1870)

Browse Source 
* Format

* Fix startup crash 🙈

* Revert "Revert "Brightness settings fixes" (#1865)"

Had to rebase then revert the revert to make git recognise and merge the change :)

This reverts commit b7e5bedf4b.

# Conflicts:
#	firmware/application/ui_navigation.cpp

* Add zxkmm to header too
This commit is contained in:
E.T 2024-02-08 18:28:49 +01:00 committed by GitHub
parent f80c28cde7
commit fd03bb800c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/application/apps/ui_settings.cpp
View File

@ -763,12 +763,10 @@ SetFakeBrightnessView::SetFakeBrightnessView(NavigationView& nav) {
field_fake_brightness.set_by_value(pmem::fake_brightness_level()); field_fake_brightness.set_by_value(pmem::fake_brightness_level());
checkbox_brightness_switch.set_value(pmem::apply_fake_brightness()); 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&) { 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()); pmem::set_fake_brightness_level(field_fake_brightness.selected_index_value());
send_system_refresh();
nav.pop(); nav.pop();
}; };

22
firmware/application/ui_navigation.cpp
View File

@ -1,6 +1,8 @@
/* /*
* Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc. * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
* Copyright (C) 2016 Furrtek * Copyright (C) 2016 Furrtek
* Copyright (C) 2024 u-foka
* Copyleft (ɔ) 2024 zxkmm under GPL license
* *
* This file is part of PortaPack. * This file is part of PortaPack.
* *
@ -330,21 +332,10 @@ SystemStatusView::SystemStatusView(
toggle_fake_brightness.on_change = [this, &nav](bool v) { toggle_fake_brightness.on_change = [this, &nav](bool v) {
set_dirty(); set_dirty();
pmem::set_apply_fake_brightness(v); 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(); refresh();
if (nullptr != parent()) {
parent()->set_dirty(); // The parent of NavigationView shal be the SystemView
}
}; };
button_bias_tee.on_select = [this](ImageButton&) { button_bias_tee.on_select = [this](ImageButton&) {
@ -413,6 +404,9 @@ void SystemStatusView::refresh() {
button_converter.set_bitmap(pmem::config_updown_converter() ? &bitmap_icon_downconvert : &bitmap_icon_upconvert); 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()); button_converter.set_foreground(pmem::config_converter() ? Color::red() : Color::light_grey());
// Brightness
toggle_fake_brightness.set_value(pmem::apply_fake_brightness());
set_dirty(); set_dirty();
} }

2
firmware/application/ui_navigation.hpp
View File

@ -1,6 +1,8 @@
/* /*
* Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc. * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
* Copyright (C) 2016 Furrtek * Copyright (C) 2016 Furrtek
* Copyright (C) 2024 u-foka
* Copyleft (ɔ) 2024 zxkmm under GPL license
* *
* This file is part of PortaPack. * This file is part of PortaPack.
* *