mirror of
https://github.com/eried/portapack-mayhem.git
synced 2025-08-12 08:30:27 -04:00
Merge remote-tracking branch 'upstream/master'
Conflicts: firmware/Makefile firmware/application/Makefile firmware/application/event_m0.cpp firmware/application/ui_setup.cpp firmware/application/ui_setup.hpp firmware/baseband/baseband_thread.cpp firmware/baseband/baseband_thread.hpp firmware/bootstrap/CMakeLists.txt firmware/common/message.hpp firmware/common/portapack_shared_memory.hpp hardware/.gitignore
This commit is contained in:
commit
fdfa7c9776
138 changed files with 17603 additions and 1930 deletions
|
@ -238,6 +238,13 @@ std::string View::title() const {
|
|||
|
||||
/* Rectangle *************************************************************/
|
||||
|
||||
Rectangle::Rectangle(
|
||||
Color c
|
||||
) : Widget { },
|
||||
color { c }
|
||||
{
|
||||
}
|
||||
|
||||
Rectangle::Rectangle(
|
||||
Rect parent_rect,
|
||||
Color c
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue