From 40caa999f41c1bcb2c2b1a4ca3391002527b286c Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphaelcoeffic@users.noreply.github.com>
Date: Mon, 31 Oct 2022 08:46:31 +0100
Subject: [PATCH] fix(color): prevent event bubbling in Page and TabsGroup
 (#2642)

... otherwise unexpected things happen
---
 radio/src/gui/colorlcd/page.cpp      | 5 +++++
 radio/src/gui/colorlcd/page.h        | 2 ++
 radio/src/gui/colorlcd/tabsgroup.cpp | 2 --
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/radio/src/gui/colorlcd/page.cpp b/radio/src/gui/colorlcd/page.cpp
index cbaec0627..ec95c8546 100644
--- a/radio/src/gui/colorlcd/page.cpp
+++ b/radio/src/gui/colorlcd/page.cpp
@@ -83,3 +83,8 @@ void Page::onClicked()
 {
   Keyboard::hide();
 }
+
+void Page::onEvent(event_t event)
+{
+  // block event bubbling
+}
diff --git a/radio/src/gui/colorlcd/page.h b/radio/src/gui/colorlcd/page.h
index 8a4084625..ee85f14d4 100644
--- a/radio/src/gui/colorlcd/page.h
+++ b/radio/src/gui/colorlcd/page.h
@@ -61,6 +61,8 @@ class Page : public Window
  protected:
   PageHeader header;
   FormWindow body;
+
+  void onEvent(event_t event) override;
 };
 
 #endif // _PAGE_H_
diff --git a/radio/src/gui/colorlcd/tabsgroup.cpp b/radio/src/gui/colorlcd/tabsgroup.cpp
index f10a36084..1840f7b00 100644
--- a/radio/src/gui/colorlcd/tabsgroup.cpp
+++ b/radio/src/gui/colorlcd/tabsgroup.cpp
@@ -271,8 +271,6 @@ void TabsGroup::onEvent(event_t event)
     killEvents(event);
     uint8_t current = header.carousel.getCurrentIndex();
     setCurrentTab(current == 0 ? tabs.size() - 1 : current - 1);
-  } else if (parent) {
-    parent->onEvent(event);
   }
 #endif
 }