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

Merge 'upstream/master' - At least it builds...

Browse source
This commit is contained in:
furrtek 2017-01-16 03:45:44 +00:00
commit 5e40669cbc
298 changed files with 8122 additions and 4685 deletions
Download patch file Download diff file Expand all files Collapse all files

14
firmware/application/ui_navigation.hpp
View file

@ -55,7 +55,7 @@ enum modal_t {
class SystemStatusView : public View {
public:
std::function<void(void)> on_back;
std::function<void(void)> on_back { };
SystemStatusView();
@ -116,12 +116,14 @@ private:
class NavigationView : public View {
public:
std::function<void(const View&)> on_view_changed;
std::function<void(const View&)> on_view_changed { };
NavigationView() { }
NavigationView() = default;
NavigationView(const NavigationView&) = delete;
NavigationView(NavigationView&&) = delete;
NavigationView& operator=(const NavigationView&) = delete;
NavigationView& operator=(NavigationView&&) = delete;
bool is_top() const;
@ -141,7 +143,7 @@ public:
void focus() override;
private:
std::vector<std::unique_ptr<View>> view_stack;
std::vector<std::unique_ptr<View>> view_stack { };
Widget* modal_view { nullptr };
Widget* view() const;
@ -300,8 +302,8 @@ public:
Context& context() const override;
private:
SystemStatusView status_view;
NavigationView navigation_view;
SystemStatusView status_view { };
NavigationView navigation_view { };
Context& context_;
};