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

Move RegistersWidget/Views methods to .cpp.

Browse Source
This commit is contained in:
Jared Boone 2015-12-14 11:30:24 -08:00
parent 2ee072aa7b
commit 56c3167156
2 changed files with 46 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
firmware/application/ui_debug.cpp
View File

@ -59,6 +59,15 @@ void DebugMemoryView::focus() {
/* RegistersWidget *******************************************************/ /* RegistersWidget *******************************************************/
RegistersWidget::RegistersWidget(
RegistersWidgetConfig&& config,
std::function<uint32_t(const size_t register_number)>&& reader
) : Widget { },
config(std::move(config)),
reader(std::move(reader))
{
}
void RegistersWidget::update() { void RegistersWidget::update() {
set_dirty(); set_dirty();
} }
@ -104,6 +113,40 @@ void RegistersWidget::draw_values(
} }
} }
/* RegistersView *********************************************************/
RegistersView::RegistersView(
NavigationView& nav,
const std::string& title,
RegistersWidgetConfig&& config,
std::function<uint32_t(const size_t register_number)>&& reader
) : registers_widget { std::move(config), std::move(reader) }
{
add_children({ {
&text_title,
&registers_widget,
&button_update,
&button_done,
} });
button_update.on_select = [this](Button&){
this->registers_widget.update();
};
button_done.on_select = [&nav](Button&){ nav.pop(); };
registers_widget.set_parent_rect({ 0, 48, 240, 192 });
text_title.set_parent_rect({
static_cast<Coord>((240 - title.size() * 8) / 2), 16,
static_cast<Dim>(title.size() * 8), 16
});
text_title.set(title);
}
void RegistersView::focus() {
button_done.focus();
}
/* DebugMenuView *********************************************************/ /* DebugMenuView *********************************************************/
DebugMenuView::DebugMenuView(NavigationView& nav) { DebugMenuView::DebugMenuView(NavigationView& nav) {

33
firmware/application/ui_debug.hpp
View File

@ -114,11 +114,7 @@ public:
RegistersWidget( RegistersWidget(
RegistersWidgetConfig&& config, RegistersWidgetConfig&& config,
std::function<uint32_t(const size_t register_number)>&& reader std::function<uint32_t(const size_t register_number)>&& reader
) : Widget { }, );
config(std::move(config)),
reader(std::move(reader))
{
}
void update(); void update();
@ -141,32 +137,9 @@ public:
const std::string& title, const std::string& title,
RegistersWidgetConfig&& config, RegistersWidgetConfig&& config,
std::function<uint32_t(const size_t register_number)>&& reader std::function<uint32_t(const size_t register_number)>&& reader
) : registers_widget { std::move(config), std::move(reader) } );
{
add_children({ {
&text_title,
&registers_widget,
&button_update,
&button_done,
} });
button_update.on_select = [this](Button&){ void focus();
this->registers_widget.update();
};
button_done.on_select = [&nav](Button&){ nav.pop(); };
registers_widget.set_parent_rect({ 0, 48, 240, 192 });
text_title.set_parent_rect({
static_cast<Coord>((240 - title.size() * 8) / 2), 16,
static_cast<Dim>(title.size() * 8), 16
});
text_title.set(title);
}
void focus() {
button_done.focus();
}
private: private:
Text text_title; Text text_title;