kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Ignore touchpad touch events, on macOS unreliable.

Browse source
This commit is contained in:
John Preston 2023-06-28 15:04:56 +04:00
parent 6fe9e08386
commit a6d472ee68
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ui/widgets/scroll_area.cpp
View file

@ -9,6 +9,7 @@
#include "ui/painter.h" #include "ui/painter.h"
#include "ui/ui_utility.h" #include "ui/ui_utility.h"
#include "base/qt/qt_common_adapters.h" #include "base/qt/qt_common_adapters.h"
#include "base/debug_log.h"
#include <QtWidgets/QScrollBar> #include <QtWidgets/QScrollBar>
#include <QtWidgets/QApplication> #include <QtWidgets/QApplication>
@ -511,12 +512,13 @@ bool ScrollArea::filterOutTouchEvent(QEvent *e) {
|| type == QEvent::TouchEnd || type == QEvent::TouchEnd
|| type == QEvent::TouchCancel) { || type == QEvent::TouchCancel) {
const auto ev = static_cast<QTouchEvent*>(e); const auto ev = static_cast<QTouchEvent*>(e);
if (_customTouchProcess && _customTouchProcess(ev)) { if (ev->device()->type() == base::TouchDevice::TouchScreen) {
return true; if (_customTouchProcess && _customTouchProcess(ev)) {
} else if (_touchEnabled return true;
&& ev->device()->type() == base::TouchDevice::TouchScreen) { } else if (_touchEnabled) {
touchEvent(ev); touchEvent(ev);
return true; return true;
}
} }
} }
return false; return false;