From 1ca40488f2d4e2081fd495f0bf9383e640d4cb5c Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Tue, 14 Mar 2017 21:03:57 -0700 Subject: [PATCH] Use touch events for LogoScreen dismiss. --- UI/MiscScreens.cpp | 10 +++++++++- UI/MiscScreens.h | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp index b975ee2010..ff2ae0b0fc 100644 --- a/UI/MiscScreens.cpp +++ b/UI/MiscScreens.cpp @@ -416,7 +416,7 @@ const float logoScreenSeconds = 2.5f; void LogoScreen::update(InputState &input_state) { UIScreen::update(input_state); frames_++; - if (frames_ > 60 * logoScreenSeconds || input_state.pointer_down[0]) { + if (frames_ > 60 * logoScreenSeconds) { Next(); } } @@ -435,6 +435,14 @@ bool LogoScreen::key(const KeyInput &key) { return false; } +bool LogoScreen::touch(const TouchInput &touch) { + if (touch.flags & TOUCH_DOWN) { + Next(); + return true; + } + return false; +} + void LogoScreen::render() { using namespace Draw; diff --git a/UI/MiscScreens.h b/UI/MiscScreens.h index 63bd461bf2..5a8ea26515 100644 --- a/UI/MiscScreens.h +++ b/UI/MiscScreens.h @@ -115,6 +115,7 @@ public: LogoScreen() : frames_(0), switched_(false) {} bool key(const KeyInput &key) override; + bool touch(const TouchInput &touch) override; void update(InputState &input) override; void render() override; void sendMessage(const char *message, const char *value) override;