Fix rebase issues
This commit is contained in:
parent
289f45f4b9
commit
171d6f76a9
|
|
@ -225,17 +225,7 @@ void _ui_drawSettingsTimeDateSet(state_t* last_state, ui_state_t* ui_state)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void _ui_drawSettingsDisplay(state_t* last_state, ui_state_t* ui_state)
|
bool _ui_drawMacroMenu(state_t* last_state) {
|
||||||
{
|
|
||||||
gfx_clearScreen();
|
|
||||||
// Print "Display" on top bar
|
|
||||||
gfx_print(layout.top_left, "Display", layout.top_font,
|
|
||||||
TEXT_ALIGN_CENTER, color_white);
|
|
||||||
// Print menu entries
|
|
||||||
_ui_drawSettingsDisplayList(layout.line1_left, display_items, settings_num, ui_state->menu_selected);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool _ui_drawMenuMacro(state_t* last_state) {
|
|
||||||
// Header
|
// Header
|
||||||
gfx_print(layout.top_left, "Macro Menu", layout.top_font, TEXT_ALIGN_CENTER,
|
gfx_print(layout.top_left, "Macro Menu", layout.top_font, TEXT_ALIGN_CENTER,
|
||||||
color_white);
|
color_white);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue