Implemented back interface for other displays
This commit is contained in:
@@ -31,6 +31,8 @@ public:
|
|||||||
void redraw() override;
|
void redraw() override;
|
||||||
void stop() override;
|
void stop() override;
|
||||||
|
|
||||||
|
void back() override;
|
||||||
|
|
||||||
void triggered() override;
|
void triggered() override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
@@ -97,6 +99,12 @@ void CalibrateDisplay::stop()
|
|||||||
currentMode = m_oldMode;
|
currentMode = m_oldMode;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void CalibrateDisplay::back()
|
||||||
|
{
|
||||||
|
if (!m_bootup)
|
||||||
|
switchScreen<BoardcomputerHardwareSettingsMenu>();
|
||||||
|
}
|
||||||
|
|
||||||
void CalibrateDisplay::triggered()
|
void CalibrateDisplay::triggered()
|
||||||
{
|
{
|
||||||
if (m_bootup)
|
if (m_bootup)
|
||||||
|
@@ -13,7 +13,7 @@ class GraphsMenu;
|
|||||||
}
|
}
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
class DualGraphDisplay : public DemoDisplay, public SwitchScreenAction<GraphsMenu>
|
class DualGraphDisplay : public DemoDisplay, public SwitchScreenAction<GraphsMenu>, public BackActionInterface<SwitchScreenAction<GraphsMenu>>
|
||||||
{
|
{
|
||||||
using Base = DemoDisplay;
|
using Base = DemoDisplay;
|
||||||
|
|
||||||
|
@@ -14,7 +14,7 @@ class DemosMenu;
|
|||||||
}
|
}
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
class GameOfLifeDisplay : public DemoDisplay, public SwitchScreenAction<DemosMenu>
|
class GameOfLifeDisplay : public DemoDisplay, public SwitchScreenAction<DemosMenu>, public BackActionInterface<SwitchScreenAction<DemosMenu>>
|
||||||
{
|
{
|
||||||
using Base = DemoDisplay;
|
using Base = DemoDisplay;
|
||||||
|
|
||||||
|
@@ -30,7 +30,7 @@ public:
|
|||||||
};
|
};
|
||||||
|
|
||||||
template<size_t COUNT>
|
template<size_t COUNT>
|
||||||
class GraphDisplay : public DemoDisplay, public SwitchScreenAction<GraphsMenu>, public virtual TextInterface, public virtual MultiStatisticsInterface<COUNT>
|
class GraphDisplay : public DemoDisplay, public SwitchScreenAction<GraphsMenu>, public virtual TextInterface, public BackActionInterface<SwitchScreenAction<GraphsMenu>>, public virtual MultiStatisticsInterface<COUNT>
|
||||||
{
|
{
|
||||||
using Base = DemoDisplay;
|
using Base = DemoDisplay;
|
||||||
|
|
||||||
|
@@ -16,7 +16,7 @@ class BmsDisplay;
|
|||||||
}
|
}
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
class MetersDisplay : public DemoDisplay, public SwitchScreenAction<MainMenu>
|
class MetersDisplay : public DemoDisplay, public SwitchScreenAction<MainMenu>, public BackActionInterface<SwitchScreenAction<MainMenu>>
|
||||||
{
|
{
|
||||||
using Base = DemoDisplay;
|
using Base = DemoDisplay;
|
||||||
|
|
||||||
|
@@ -13,7 +13,7 @@ class DemosMenu;
|
|||||||
}
|
}
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
class PingPongDisplay : public DemoDisplay, public SwitchScreenAction<DemosMenu>
|
class PingPongDisplay : public DemoDisplay, public SwitchScreenAction<DemosMenu>, public BackActionInterface<SwitchScreenAction<DemosMenu>>
|
||||||
{
|
{
|
||||||
using Base = DemoDisplay;
|
using Base = DemoDisplay;
|
||||||
|
|
||||||
|
@@ -13,7 +13,7 @@ class DemosMenu;
|
|||||||
}
|
}
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
class SpiroDisplay : public DemoDisplay, public SwitchScreenAction<DemosMenu>
|
class SpiroDisplay : public DemoDisplay, public SwitchScreenAction<DemosMenu>, public BackActionInterface<SwitchScreenAction<DemosMenu>>
|
||||||
{
|
{
|
||||||
using Base = DemoDisplay;
|
using Base = DemoDisplay;
|
||||||
|
|
||||||
|
@@ -13,7 +13,7 @@ class DemosMenu;
|
|||||||
}
|
}
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
class StarfieldDisplay : public DemoDisplay, public SwitchScreenAction<DemosMenu>
|
class StarfieldDisplay : public DemoDisplay, public SwitchScreenAction<DemosMenu>, public BackActionInterface<SwitchScreenAction<DemosMenu>>
|
||||||
{
|
{
|
||||||
using Base = DemoDisplay;
|
using Base = DemoDisplay;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user