From a3a949f5e61535ecd598e1879d7c4a22d7352b2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 31 Dec 2022 21:41:32 +0100 Subject: [PATCH] Remove touch() return values from screen hierarchy --- Common/UI/Screen.cpp | 8 +++----- Common/UI/Screen.h | 4 ++-- Common/UI/UIScreen.cpp | 10 ++++------ Common/UI/UIScreen.h | 4 ++-- UI/ControlMappingScreen.cpp | 3 +-- UI/ControlMappingScreen.h | 2 +- UI/EmuScreen.cpp | 7 ++----- UI/EmuScreen.h | 2 +- UI/MiscScreens.cpp | 4 +--- UI/MiscScreens.h | 2 +- 10 files changed, 18 insertions(+), 28 deletions(-) diff --git a/Common/UI/Screen.cpp b/Common/UI/Screen.cpp index 416c69dc6e..1657253ace 100644 --- a/Common/UI/Screen.cpp +++ b/Common/UI/Screen.cpp @@ -75,20 +75,18 @@ void ScreenManager::switchToNext() { nextStack_.clear(); } -bool ScreenManager::touch(const TouchInput &touch) { +void ScreenManager::touch(const TouchInput &touch) { std::lock_guard guard(inputLock_); - bool result = false; // Send release all events to every screen layer. if (touch.flags & TOUCH_RELEASE_ALL) { for (auto &layer : stack_) { Screen *screen = layer.screen; - result = layer.screen->touch(screen->transformTouch(touch)); + layer.screen->touch(screen->transformTouch(touch)); } } else if (!stack_.empty()) { Screen *screen = stack_.back().screen; - result = stack_.back().screen->touch(screen->transformTouch(touch)); + stack_.back().screen->touch(screen->transformTouch(touch)); } - return result; } bool ScreenManager::key(const KeyInput &key) { diff --git a/Common/UI/Screen.h b/Common/UI/Screen.h index 42f0830627..c39fd79f49 100644 --- a/Common/UI/Screen.h +++ b/Common/UI/Screen.h @@ -55,7 +55,7 @@ public: virtual void postRender() {} virtual void resized() {} virtual void dialogFinished(const Screen *dialog, DialogResult result) {} - virtual bool touch(const TouchInput &touch) { return false; } + virtual void touch(const TouchInput &touch) {} virtual bool key(const KeyInput &key) { return false; } virtual bool axis(const AxisInput &touch) { return false; } virtual void sendMessage(const char *msg, const char *value) {} @@ -132,7 +132,7 @@ public: Screen *dialogParent(const Screen *dialog) const; // Instant touch, separate from the update() mechanism. - bool touch(const TouchInput &touch); + void touch(const TouchInput &touch); bool key(const KeyInput &key); bool axis(const AxisInput &touch); diff --git a/Common/UI/UIScreen.cpp b/Common/UI/UIScreen.cpp index d1623101d0..0764b3c30c 100644 --- a/Common/UI/UIScreen.cpp +++ b/Common/UI/UIScreen.cpp @@ -151,7 +151,7 @@ TouchInput UIScreen::transformTouch(const TouchInput &touch) { return updated; } -bool UIScreen::touch(const TouchInput &touch) { +void UIScreen::touch(const TouchInput &touch) { if (root_) { if (ClickDebug && (touch.flags & TOUCH_DOWN)) { INFO_LOG(SYSTEM, "Touch down!"); @@ -163,9 +163,7 @@ bool UIScreen::touch(const TouchInput &touch) { } UI::TouchEvent(touch, root_); - return true; } - return false; } bool UIScreen::key(const KeyInput &key) { @@ -235,16 +233,16 @@ PopupScreen::PopupScreen(std::string title, std::string button1, std::string but alpha_ = 0.0f; } -bool PopupScreen::touch(const TouchInput &touch) { +void PopupScreen::touch(const TouchInput &touch) { if (!box_ || (touch.flags & TOUCH_DOWN) == 0) { - return UIDialogScreen::touch(touch); + UIDialogScreen::touch(touch); } if (!box_->GetBounds().Contains(touch.x, touch.y)) { TriggerFinish(DR_BACK); } - return UIDialogScreen::touch(touch); + UIDialogScreen::touch(touch); } bool PopupScreen::key(const KeyInput &key) { diff --git a/Common/UI/UIScreen.h b/Common/UI/UIScreen.h index 50a5f1f2d9..113acd15ef 100644 --- a/Common/UI/UIScreen.h +++ b/Common/UI/UIScreen.h @@ -25,7 +25,7 @@ public: void deviceLost() override; void deviceRestored() override; - bool touch(const TouchInput &touch) override; + void touch(const TouchInput &touch) override; bool key(const KeyInput &touch) override; bool axis(const AxisInput &touch) override; @@ -76,7 +76,7 @@ public: virtual void CreatePopupContents(UI::ViewGroup *parent) = 0; void CreateViews() override; bool isTransparent() const override { return true; } - bool touch(const TouchInput &touch) override; + void touch(const TouchInput &touch) override; bool key(const KeyInput &key) override; void TriggerFinish(DialogResult result) override; diff --git a/UI/ControlMappingScreen.cpp b/UI/ControlMappingScreen.cpp index 9ca3bb5f74..3896d19ac9 100644 --- a/UI/ControlMappingScreen.cpp +++ b/UI/ControlMappingScreen.cpp @@ -672,7 +672,7 @@ UI::EventReturn AnalogSetupScreen::OnResetToDefaults(UI::EventParams &e) { return UI::EVENT_DONE; } -bool TouchTestScreen::touch(const TouchInput &touch) { +void TouchTestScreen::touch(const TouchInput &touch) { UIDialogScreenWithGameBackground::touch(touch); if (touch.flags & TOUCH_DOWN) { bool found = false; @@ -721,7 +721,6 @@ bool TouchTestScreen::touch(const TouchInput &touch) { WARN_LOG(SYSTEM, "Touch release without touch down"); } } - return true; } void TouchTestScreen::CreateViews() { diff --git a/UI/ControlMappingScreen.h b/UI/ControlMappingScreen.h index d9ba4ab315..0ddc8105c1 100644 --- a/UI/ControlMappingScreen.h +++ b/UI/ControlMappingScreen.h @@ -140,7 +140,7 @@ public: } } - bool touch(const TouchInput &touch) override; + void touch(const TouchInput &touch) override; void render() override; bool key(const KeyInput &key) override; diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp index 60fd0062a8..0d2456583e 100644 --- a/UI/EmuScreen.cpp +++ b/UI/EmuScreen.cpp @@ -560,14 +560,14 @@ inline float clamp1(float x) { return x; } -bool EmuScreen::touch(const TouchInput &touch) { +void EmuScreen::touch(const TouchInput &touch) { Core_NotifyActivity(); if (chatMenu_ && chatMenu_->GetVisibility() == UI::V_VISIBLE) { // Avoid pressing touch button behind the chat if (chatMenu_->Contains(touch.x, touch.y)) { chatMenu_->Touch(touch); - return true; + return; } else if ((touch.flags & TOUCH_DOWN) != 0) { chatMenu_->Close(); if (chatButton_) @@ -578,9 +578,6 @@ bool EmuScreen::touch(const TouchInput &touch) { if (root_) { root_->Touch(touch); - return true; - } else { - return false; } } diff --git a/UI/EmuScreen.h b/UI/EmuScreen.h index 1fd41ffb9d..128b730ddf 100644 --- a/UI/EmuScreen.h +++ b/UI/EmuScreen.h @@ -50,7 +50,7 @@ public: void sendMessage(const char *msg, const char *value) override; void resized() override; - bool touch(const TouchInput &touch) override; + void touch(const TouchInput &touch) override; bool key(const KeyInput &key) override; bool axis(const AxisInput &axis) override; diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp index fef1fae1b9..59209cf377 100644 --- a/UI/MiscScreens.cpp +++ b/UI/MiscScreens.cpp @@ -744,12 +744,10 @@ bool LogoScreen::key(const KeyInput &key) { return false; } -bool LogoScreen::touch(const TouchInput &touch) { +void LogoScreen::touch(const TouchInput &touch) { if (touch.flags & TOUCH_DOWN) { Next(); - return true; } - return false; } void LogoScreen::render() { diff --git a/UI/MiscScreens.h b/UI/MiscScreens.h index c55a24a725..dc8f187f66 100644 --- a/UI/MiscScreens.h +++ b/UI/MiscScreens.h @@ -137,7 +137,7 @@ public: LogoScreen(AfterLogoScreen afterLogoScreen = AfterLogoScreen::DEFAULT); bool key(const KeyInput &key) override; - bool touch(const TouchInput &touch) override; + void touch(const TouchInput &touch) override; void update() override; void render() override; void sendMessage(const char *message, const char *value) override;