From d6d771300014eafe6e9cb7330a1f3f7a1bbf30de Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Wed, 26 Jan 2022 14:00:01 +0100 Subject: [PATCH] Fix clicking on topbar --- radio/src/gui/colorlcd/layouts/topbar_impl.cpp | 8 -------- radio/src/gui/colorlcd/layouts/topbar_impl.h | 3 --- 2 files changed, 11 deletions(-) diff --git a/radio/src/gui/colorlcd/layouts/topbar_impl.cpp b/radio/src/gui/colorlcd/layouts/topbar_impl.cpp index 11df502e0..64236543c 100644 --- a/radio/src/gui/colorlcd/layouts/topbar_impl.cpp +++ b/radio/src/gui/colorlcd/layouts/topbar_impl.cpp @@ -28,7 +28,6 @@ constexpr uint32_t TOPBAR_REFRESH = 1000 / 10; // 10 Hz TopbarImpl::TopbarImpl(Window * parent) : TopbarImplBase(parent, {0, 0, LCD_W, MENU_HEADER_HEIGHT}, &g_model.topbarData) { - //attach(parent); } unsigned int TopbarImpl::getZonesCount() const @@ -224,10 +223,3 @@ void TopbarImpl::checkEvents() } } -#if defined(HARDWARE_TOUCH) -bool TopbarImpl::onTouchEnd(coord_t x, coord_t y) -{ - // disable touch interaction with topbar widgets - return false; -} -#endif diff --git a/radio/src/gui/colorlcd/layouts/topbar_impl.h b/radio/src/gui/colorlcd/layouts/topbar_impl.h index 75839f2d1..de868ac7f 100644 --- a/radio/src/gui/colorlcd/layouts/topbar_impl.h +++ b/radio/src/gui/colorlcd/layouts/topbar_impl.h @@ -56,9 +56,6 @@ class TopbarImpl: void checkEvents() override; -#if defined(HARDWARE_TOUCH) - bool onTouchEnd(coord_t x, coord_t y) override; -#endif protected: uint32_t lastRefresh = 0;