Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2024-12-25 15:29:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Limit title length when too many status icons & shade background of every other icon (#1195)

Browse Source 
* Shading alternate icon backgrounds on title bar

* Shading alternate icons on title bar

* Shading alternate icons on title bar

* Clang
This commit is contained in:
Mark Thompson 2023-06-27 03:15:58 -05:00 committed by GitHub
parent 32085f317b
commit 4ea8abb53b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
firmware/application/ui_navigation.cpp
View File

@ -110,6 +110,12 @@ StatusTray::StatusTray(Point pos)
set_focusable(false); set_focusable(false);
} }
void StatusTray::add_button(ImageButton* child) {
child->set_background((shading_) ? Color::dark_grey() : Color::darker_grey());
shading_ = !shading_;
add(child);
}
void StatusTray::add(Widget* child) { void StatusTray::add(Widget* child) {
width_ += child->parent_rect().width(); width_ += child->parent_rect().width();
add_child(child); add_child(child);
@ -136,6 +142,7 @@ void StatusTray::clear() {
child->set_parent(nullptr); child->set_parent(nullptr);
children_.clear(); children_.clear();
width_ = 0; width_ = 0;
shading_ = false;
set_parent_rect({pos_, {width_, height}}); set_parent_rect({pos_, {width_, height}});
set_dirty(); set_dirty();
} }
@ -216,17 +223,17 @@ void SystemStatusView::refresh() {
// NB: Order of insertion is the display order Left->Right. // NB: Order of insertion is the display order Left->Right.
// TODO: Might be better to support hide and only add once. // TODO: Might be better to support hide and only add once.
status_icons.clear(); status_icons.clear();
if (!pmem::ui_hide_camera()) status_icons.add(&button_camera); if (!pmem::ui_hide_camera()) status_icons.add_button(&button_camera);
if (!pmem::ui_hide_sleep()) status_icons.add(&button_sleep); if (!pmem::ui_hide_sleep()) status_icons.add_button(&button_sleep);
if (!pmem::ui_hide_stealth()) status_icons.add(&button_stealth); if (!pmem::ui_hide_stealth()) status_icons.add_button(&button_stealth);
if (!pmem::ui_hide_converter()) status_icons.add(&button_converter); if (!pmem::ui_hide_converter()) status_icons.add_button(&button_converter);
if (!pmem::ui_hide_bias_tee()) status_icons.add(&button_bias_tee); if (!pmem::ui_hide_bias_tee()) status_icons.add_button(&button_bias_tee);
if (!pmem::ui_hide_clock()) status_icons.add(&button_clock_status); if (!pmem::ui_hide_clock()) status_icons.add_button(&button_clock_status);
if (!pmem::ui_hide_mute()) status_icons.add(&button_mute); if (!pmem::ui_hide_mute()) status_icons.add_button(&button_mute);
// Display "Disable speaker" icon only if AK4951 Codec which has separate speaker/headphone control // Display "Disable speaker" icon only if AK4951 Codec which has separate speaker/headphone control
if (audio::speaker_disable_supported() && !pmem::ui_hide_speaker()) if (audio::speaker_disable_supported() && !pmem::ui_hide_speaker())
status_icons.add(&button_speaker); status_icons.add_button(&button_speaker);
if (!pmem::ui_hide_sd_card()) status_icons.add(&sd_card_status_view); if (!pmem::ui_hide_sd_card()) status_icons.add(&sd_card_status_view);
status_icons.update_layout(); status_icons.update_layout();
@ -297,7 +304,9 @@ void SystemStatusView::set_title(const std::string new_value) {
if (new_value.empty()) { if (new_value.empty()) {
title.set(default_title); title.set(default_title);
} else { } else {
title.set(new_value); // Limit length of title string to prevent partial characters if too many StatusView icons
size_t max_len = (240 - 16 - 7 - status_icons.width()) / 8;
title.set(truncate(new_value, max_len));
} }
} }

3
firmware/application/ui_navigation.hpp
View File

@ -131,10 +131,12 @@ class StatusTray : public View {
StatusTray(const StatusTray&) = delete; StatusTray(const StatusTray&) = delete;
StatusTray& operator=(const StatusTray&) = delete; StatusTray& operator=(const StatusTray&) = delete;
void add_button(ImageButton* child);
void add(Widget* child); void add(Widget* child);
void update_layout(); void update_layout();
void clear(); void clear();
void paint(Painter& painter) override; void paint(Painter& painter) override;
uint8_t width() { return width_; };
private: private:
static constexpr uint8_t height = 16; static constexpr uint8_t height = 16;
@ -142,6 +144,7 @@ class StatusTray : public View {
// track of the right edge. // track of the right edge.
const Point pos_{}; const Point pos_{};
uint8_t width_{}; uint8_t width_{};
bool shading_{};
}; };
class SystemStatusView : public View { class SystemStatusView : public View {

3
firmware/common/ui.hpp
View File

@ -140,6 +140,9 @@ struct Color {
static constexpr Color dark_grey() { static constexpr Color dark_grey() {
return {63, 63, 63}; return {63, 63, 63};
} }
static constexpr Color darker_grey() {
return {31, 31, 31};
}
static constexpr Color purple() { static constexpr Color purple() {
return {204, 0, 102}; return {204, 0, 102};