From 028c81d39f306212101cc33e6f42503cc7e510d3 Mon Sep 17 00:00:00 2001 From: sshane Date: Thu, 29 Jul 2021 19:29:49 -0700 Subject: [PATCH] keyboard multitouch improvements (#21788) --- selfdrive/ui/qt/widgets/keyboard.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/selfdrive/ui/qt/widgets/keyboard.cc b/selfdrive/ui/qt/widgets/keyboard.cc index 47cc60a85f..349e53054c 100644 --- a/selfdrive/ui/qt/widgets/keyboard.cc +++ b/selfdrive/ui/qt/widgets/keyboard.cc @@ -20,13 +20,14 @@ const float key_spacing_horizontal = 15; KeyButton::KeyButton(const QString &text, QWidget *parent) : QPushButton(text, parent) { setAttribute(Qt::WA_AcceptTouchEvents); + setFocusPolicy(Qt::NoFocus); } bool KeyButton::event(QEvent *event) { if (event->type() == QEvent::TouchBegin || event->type() == QEvent::TouchEnd) { QTouchEvent *touchEvent = static_cast(event); if (!touchEvent->touchPoints().empty()) { - const QEvent::Type mouseType = event->type() == QEvent::TouchBegin ? QEvent::MouseButtonPress : QEvent::MouseButtonRelease; + const QEvent::Type mouseType = event->type() == QEvent::TouchBegin ? QEvent::MouseButtonPress : QEvent::MouseButtonRelease; QMouseEvent mouseEvent(mouseType, touchEvent->touchPoints().front().pos(), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); QPushButton::event(&mouseEvent); event->accept(); @@ -42,7 +43,7 @@ KeyboardLayout::KeyboardLayout(QWidget* parent, const std::vectorsetSpacing(0); QButtonGroup* btn_group = new QButtonGroup(this); - QObject::connect(btn_group, SIGNAL(buttonPressed(QAbstractButton*)), parent, SLOT(handleButton(QAbstractButton*))); + QObject::connect(btn_group, SIGNAL(buttonClicked(QAbstractButton*)), parent, SLOT(handleButton(QAbstractButton*))); for (const auto &s : layout) { QHBoxLayout *hlayout = new QHBoxLayout;