From a494b38f6e482db3583200f556271fc5537dc5bd Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Fri, 11 Aug 2023 17:45:54 +0800 Subject: [PATCH] ui/map: set WA_NoMousePropagation to prevent mouse event from propagating up (#29329) set WA_NoMousePropagation old-commit-hash: 15bb9dd09612bc23cc0d59da6fafd74669e1190e --- selfdrive/ui/qt/maps/map_settings.cc | 6 +----- selfdrive/ui/qt/maps/map_settings.h | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/selfdrive/ui/qt/maps/map_settings.cc b/selfdrive/ui/qt/maps/map_settings.cc index 8229252188..018d0df984 100644 --- a/selfdrive/ui/qt/maps/map_settings.cc +++ b/selfdrive/ui/qt/maps/map_settings.cc @@ -9,6 +9,7 @@ MapSettings::MapSettings(bool closeable, QWidget *parent) : QFrame(parent) { setContentsMargins(0, 0, 0, 0); + setAttribute(Qt::WA_NoMousePropagation); auto *frame = new QVBoxLayout(this); frame->setContentsMargins(40, 40, 40, 0); @@ -88,11 +89,6 @@ MapSettings::MapSettings(bool closeable, QWidget *parent) : QFrame(parent) { current_locations = NavigationRequest::instance()->currentLocations(); } -void MapSettings::mousePressEvent(QMouseEvent *ev) { - // Prevent mouse event from propagating up - ev->accept(); -} - void MapSettings::showEvent(QShowEvent *event) { updateCurrentRoute(); } diff --git a/selfdrive/ui/qt/maps/map_settings.h b/selfdrive/ui/qt/maps/map_settings.h index 1bef04ac5d..bfffd9206d 100644 --- a/selfdrive/ui/qt/maps/map_settings.h +++ b/selfdrive/ui/qt/maps/map_settings.h @@ -50,7 +50,6 @@ public: void updateCurrentRoute(); private: - void mousePressEvent(QMouseEvent *ev) override; void showEvent(QShowEvent *event) override; void refresh();