From ee88ac7dca3fe5c7f23c9c56efa63f66aff5753d Mon Sep 17 00:00:00 2001 From: Matthew Arnold Date: Sun, 5 Feb 2023 21:02:20 +0100 Subject: [PATCH] [ui] Refactor view stack to take a GraphicDisplay This way it can be specialized with a monochrome or color display later. --- src/modm/ui/menu/communicating_view_stack.hpp | 2 +- src/modm/ui/menu/view_stack.hpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modm/ui/menu/communicating_view_stack.hpp b/src/modm/ui/menu/communicating_view_stack.hpp index 9f1c5cf7ed..77a6933266 100644 --- a/src/modm/ui/menu/communicating_view_stack.hpp +++ b/src/modm/ui/menu/communicating_view_stack.hpp @@ -29,7 +29,7 @@ namespace modm class CommunicatingViewStack : public ViewStack { public: - CommunicatingViewStack(modm::ColorGraphicDisplay* display, xpcc::Communicator* communicator) : + CommunicatingViewStack(modm::GraphicDisplay* display, xpcc::Communicator* communicator) : ViewStack(display), communicator(communicator) { diff --git a/src/modm/ui/menu/view_stack.hpp b/src/modm/ui/menu/view_stack.hpp index 188e884af8..0ed1f04ad4 100644 --- a/src/modm/ui/menu/view_stack.hpp +++ b/src/modm/ui/menu/view_stack.hpp @@ -39,7 +39,7 @@ namespace modm class ViewStack { public: - ViewStack(modm::ColorGraphicDisplay* display); + ViewStack(modm::GraphicDisplay* display); virtual ~ViewStack(); @@ -74,7 +74,7 @@ namespace modm /** * @brief getDisplay access underlying GraphicDisplay */ - inline modm::ColorGraphicDisplay& + inline modm::GraphicDisplay& getDisplay() { return *this->display; @@ -100,7 +100,7 @@ namespace modm shortButtonPress(modm::MenuButtons::Button button); protected: - modm::ColorGraphicDisplay* display; + modm::GraphicDisplay* display; modm::Stack< modm::AbstractView* , modm::LinkedList< modm::AbstractView* > > stack; }; }