Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-08-18 19:28:02 -04:00
Code Issues Projects Releases Packages Wiki Activity

Use std::unique_ptr inside NavigationView.

Browse source
This commit is contained in:
Jared Boone 2015-12-14 11:11:49 -08:00
parent 18c4672ba2
commit 969d9bd070
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
firmware/application/ui_navigation.hpp
View file

@ -59,9 +59,7 @@ public:
template<class T, class... Args>
T* push(Args&&... args) {
const auto new_view = new T(std::forward<Args>(args)...);
push_view(new_view);
return reinterpret_cast<T*>(new_view);
return reinterpret_cast<T*>(push_view(std::unique_ptr<View>(new T(std::forward<Args>(args)...))));
}
void pop();
@ -69,13 +67,13 @@ public:
void focus() override;
private:
std::vector<View*> view_stack;
std::vector<std::unique_ptr<View>> view_stack;
Widget* view() const;
void free_view();
void update_view();
void push_view(View* new_view);
View* push_view(std::unique_ptr<View> new_view);
};
class SystemMenuView : public MenuView {