procyberian/tdesktop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Switched swipe-to-reply processing on macOS from touch to scroll events.

Browse source
This commit is contained in:
23rd 2024-09-11 00:37:47 +03:00
parent dab107cf90
commit f16d1f034f
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Telegram/SourceFiles/history/history_view_swipe.cpp
View file

@ -191,7 +191,7 @@ void SetupSwipeHandler(
const auto t = static_cast<QTouchEvent*>(e.get()); const auto t = static_cast<QTouchEvent*>(e.get());
const auto touchscreen = t->device() const auto touchscreen = t->device()
&& (t->device()->type() == base::TouchDevice::TouchScreen); && (t->device()->type() == base::TouchDevice::TouchScreen);
if (!Platform::IsMac() && !touchscreen) { if (/*!Platform::IsMac() && */!touchscreen) {
break; break;
} else if (type == QEvent::TouchBegin) { } else if (type == QEvent::TouchBegin) {
// Reset state in case we lost some TouchEnd. // Reset state in case we lost some TouchEnd.
@ -235,6 +235,7 @@ void SetupSwipeHandler(
case QEvent::Wheel: { case QEvent::Wheel: {
const auto w = static_cast<QWheelEvent*>(e.get()); const auto w = static_cast<QWheelEvent*>(e.get());
const auto phase = w->phase(); const auto phase = w->phase();
#if 0
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
if (phase == Qt::ScrollBegin) { if (phase == Qt::ScrollBegin) {
state->twoFingerScrollStarted = true; state->twoFingerScrollStarted = true;
@ -246,7 +247,8 @@ void SetupSwipeHandler(
state->twoFingerScrollStarted = false; state->twoFingerScrollStarted = false;
} }
#endif // Q_OS_MAC #endif // Q_OS_MAC
if (Platform::IsMac() || phase == Qt::NoScrollPhase) { #endif
if (/*Platform::IsMac() || */phase == Qt::NoScrollPhase) {
break; break;
} else if (phase == Qt::ScrollBegin) { } else if (phase == Qt::ScrollBegin) {
// Reset state in case we lost some TouchEnd. // Reset state in case we lost some TouchEnd.