[menu] Add optional allocator for ui menu classes (#5)

* [menu] Add optional allocator for ui menu classes, used for destroying AbstractViews

* [menu] remove coupling between modm gui and modm menu view and menu

This is because the gui stuff requires colored menus
but the menu code should not have to have colored
menus. This wouldn't be an issue if we could dynamic
cast but on certain devices you can't do this.

src/modm/ui/display/color_graphic_display.hpp

@@ -5,8 +5,6 @@
 
 #include "graphic_display.hpp"
 
-using namespace modm::platform;
-
 namespace modm
 {
 

src/modm/ui/gui/view.cpp

@@ -18,9 +18,10 @@
 
 // ----------------------------------------------------------------------------
 modm::gui::View::View(modm::gui::GuiViewStack* stack, uint8_t identifier, modm::gui::Dimension dimension) :
-	AbstractView(stack, identifier),
 	stack(stack),
-	dimension(dimension)
+	dimension(dimension),
+	identifier(identifier),
+	alive(true)
 {
 	this->display().clear();
 }
@@ -161,3 +162,9 @@ void modm::gui::View::markDrawn()
 		(*iter)->markDrawn();
 	}
 }
+
+modm::ColorGraphicDisplay&
+modm::gui::View::display()
+{
+	return stack->getDisplay();
+}

src/modm/ui/gui/view.hpp

@@ -41,7 +41,7 @@ class GuiViewStack;
  * @ingroup modm_ui_gui
  * @author	Thorsten Lajewski
  */
-class View : public modm::AbstractView
+class View
 {
 	friend class GuiViewStack;
 
@@ -61,6 +61,14 @@ class View : public modm::AbstractView
 	virtual void
 	update();
 
+	/**
+	 * @brief hasChanged indicates the current displayed view has changed.
+	 *        This function prevents unnecessary drawing of the display
+	 * @return if true the display has to be redrawn.
+	 */
+	virtual bool
+	hasChanged() = 0;
+
 	virtual void
 	preUpdate()
 	{
@@ -75,14 +83,43 @@ class View : public modm::AbstractView
 	virtual void
 	draw();
 
+	/**
+	 * @brief shortButtonPress handle the action for the pressed button
+	 */
+	virtual void
+	shortButtonPress(modm::MenuButtons::Button /*button*/)
+	{
+		// nothing to be done
+	}
+
 	/// Add widget to view
 	bool
 	pack(Widget *w, const modm::glcd::Point &coord);
 
+	/**
+	 * @brief isAlive tells the ViewStack if it should remove this screen.
+	 * @return
+	 */
+	bool
+	isAlive() const
+	{
+		return this->alive;
+	}
+
 	/// Remove the view from the screen. The viewStack handles the deletion.
 	void
 	remove();
 
+	/**
+	 * @brief onRemove will be called right before the view gets deleted,
+	 *        can be reimplemented to reset external data.
+	 */
+	virtual void
+	onRemove()
+	{
+		// nothing to be done here
+	}
+
 	/// Set color palette for every contained widget
 	void
 	setColorPalette(ColorPalette& cp);
@@ -105,12 +142,25 @@ class View : public modm::AbstractView
 		return stack;
 	}
 
+	modm::ColorGraphicDisplay&
+	display();
+
+	/**
+	 * @brief getIdentifier of the view.
+	 */
+	inline uint8_t getIdentifier(){
+		return this->identifier;
+	}
+
 protected:
 	modm::gui::GuiViewStack* stack;
 	Dimension dimension;
 	WidgetContainer widgets;
 
 	modm::gui::ColorPalette colorpalette;
+
+	const uint8_t identifier;
+	bool alive;
 };
 
 }	// namespace gui

src/modm/ui/gui/view_stack.cpp

@@ -20,7 +20,7 @@
 
 // ----------------------------------------------------------------------------
 modm::gui::GuiViewStack::GuiViewStack(modm::ColorGraphicDisplay* display, modm::gui::inputQueue* queue) :
-	ViewStack(display),
+	display(display),
 	input_queue(queue)
 {
 }

src/modm/ui/gui/view_stack.hpp

@@ -41,7 +41,7 @@ namespace gui
  * @ingroup modm_ui_gui
  * @author	Thorsten Lajewski
  */
-class GuiViewStack : public modm::ViewStack
+class GuiViewStack
 {
 public:
 	GuiViewStack(modm::ColorGraphicDisplay* display, modm::gui::inputQueue* queue);
@@ -84,7 +84,29 @@ class GuiViewStack : public modm::ViewStack
 	virtual void
 	update();
 
+	/**
+	 * @brief shortButtonPress pass the button press to the current top view
+	 * @param button the pressed button
+	 */
+
+	void
+	shortButtonPress(modm::MenuButtons::Button button)
+	{
+		modm::gui::View* top = this->get();
+		top->shortButtonPress(button);
+	}
+
+	/**
+	 * @brief getDisplay access underlying GraphicDisplay
+	 */
+	inline modm::ColorGraphicDisplay&
+	getDisplay()
+	{
+		return *this->display;
+	}
+
 private:
+	modm::ColorGraphicDisplay *display;
 	modm::Stack< modm::gui::View* , modm::LinkedList< modm::gui::View* > > stack;
 	modm::gui::inputQueue *input_queue;
 };

src/modm/ui/menu/abstract_menu.hpp

@@ -30,12 +30,17 @@ namespace modm{
 	 * \author Thorsten Lajewski
 	 * \ingroup modm_ui_menu
 	 */
-	class AbstractMenu: public AbstractView
+	template<typename Allocator = allocator::Dynamic<IAbstractView> >
+	class AbstractMenu : public AbstractView<Allocator>
 	{
 		public:
 
-			AbstractMenu(modm::ViewStack* stack, uint8_t identifier);
+			AbstractMenu(modm::ViewStack<Allocator>* stack, uint8_t identifier) :
+				modm::AbstractView<Allocator>(stack, identifier)
+			{
+			}
 
+			virtual ~AbstractMenu() {}
 
 			virtual void
 			shortButtonPress(modm::MenuButtons::Button button) = 0;