Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-02-25 09:01:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

add cursor to font viewer app (#2528)

Browse Source
This commit is contained in:
sommermorgentraum 2025-02-22 20:37:06 +08:00 committed by GitHub
parent 5e55444f19
commit fcdccdea85
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
firmware/application/external/font_viewer/ui_font_viewer.cpp vendored
View File

@ -1,5 +1,6 @@
/* /*
* Copyright (C) 2023 Mark Thompson * Copyright (C) 2023 Mark Thompson
* copyleft Whiterose of the Dark Army
* *
* This file is part of PortaPack. * This file is part of PortaPack.
* *
@ -32,7 +33,7 @@ namespace ui::external_app::font_viewer {
/* DebugFontsView *******************************************************/ /* DebugFontsView *******************************************************/
uint16_t DebugFontsView::display_font(Painter& painter, uint16_t y_offset, const Style* font_style, std::string_view font_name) { uint16_t DebugFontsView::display_font(Painter& painter, uint16_t y_offset, const Style* font_style, std::string_view font_name, bool is_big_font) {
auto char_width{font_style->font.char_width()}; auto char_width{font_style->font.char_width()};
auto char_height{font_style->font.line_height()}; auto char_height{font_style->font.line_height()};
auto cpl{((screen_width / char_width) - 6) & 0xF8}; // Display a multiple of 8 characters per line auto cpl{((screen_width / char_width) - 6) & 0xF8}; // Display a multiple of 8 characters per line
@ -47,8 +48,16 @@ uint16_t DebugFontsView::display_font(Painter& painter, uint16_t y_offset, const
if ((c % cpl) == 0) if ((c % cpl) == 0)
painter.draw_string({0, line_pos}, *font_style, "Ox" + to_string_hex(c + 0x20, 2)); painter.draw_string({0, line_pos}, *font_style, "Ox" + to_string_hex(c + 0x20, 2));
Style highlight_style_big = *Theme::getInstance()->fg_red;
Style highlight_style_small = *Theme::getInstance()->bg_important_small;
if (c == field_cursor.value()) {
painter.draw_char({((c % cpl) + 5) * char_width, line_pos},
is_big_font ? highlight_style_big : highlight_style_small,
(char)(c + 0x20));
} else {
painter.draw_char({((c % cpl) + 5) * char_width, line_pos}, *font_style, (char)(c + 0x20)); painter.draw_char({((c % cpl) + 5) * char_width, line_pos}, *font_style, (char)(c + 0x20));
} }
}
return line_pos + char_height; return line_pos + char_height;
} }
@ -56,13 +65,29 @@ uint16_t DebugFontsView::display_font(Painter& painter, uint16_t y_offset, const
void DebugFontsView::paint(Painter& painter) { void DebugFontsView::paint(Painter& painter) {
int16_t line_pos; int16_t line_pos;
line_pos = display_font(painter, 32, Theme::getInstance()->bg_darkest, "Fixed 8x16"); line_pos = display_font(painter, 32, Theme::getInstance()->bg_darkest, "Fixed 8x16", true);
display_font(painter, line_pos + 16, Theme::getInstance()->bg_darkest_small, "Fixed 5x8"); display_font(painter, line_pos + 16, Theme::getInstance()->bg_darkest_small, "Fixed 5x8", false);
}
void DebugFontsView::update_address_text() {
uint8_t ascii_value = field_cursor.value() + 0x20;
text_address.set("0x" + to_string_hex(ascii_value, 2));
} }
DebugFontsView::DebugFontsView(NavigationView& nav) DebugFontsView::DebugFontsView(NavigationView& nav)
: nav_{nav} { : nav_{nav} {
add_children({&field_cursor,
&text_address});
set_focusable(true); set_focusable(true);
field_cursor.on_change = [&](int32_t) {
update_address_text();
set_dirty();
};
}
void DebugFontsView::focus() {
field_cursor.focus();
} }
} /* namespace ui::external_app::font_viewer */ } /* namespace ui::external_app::font_viewer */

16
firmware/application/external/font_viewer/ui_font_viewer.hpp vendored
View File

@ -1,5 +1,6 @@
/* /*
* Copyright (C) 2023 Mark Thompson * Copyright (C) 2023 Mark Thompson
* copyleft Whiterose of the Dark Army
* *
* This file is part of PortaPack. * This file is part of PortaPack.
* *
@ -39,10 +40,23 @@ class DebugFontsView : public View {
public: public:
DebugFontsView(NavigationView& nav); DebugFontsView(NavigationView& nav);
void paint(Painter& painter) override; void paint(Painter& painter) override;
void focus() override;
std::string title() const override { return "Fonts"; }; std::string title() const override { return "Fonts"; };
private: private:
uint16_t display_font(Painter& painter, uint16_t y_offset, const Style* font_style, std::string_view font_name); uint16_t display_font(Painter& painter, uint16_t y_offset, const Style* font_style, std::string_view font_name, bool is_big_font);
void update_address_text();
NumberField field_cursor{
{0 * 8, 0 * 8},
1,
{0, 1000},
1,
' '};
Text text_address{
{screen_width / 2, 0 * 16, screen_width / 2, 16},
"0x20",
};
NavigationView& nav_; NavigationView& nav_;
}; };