From 623a3340804388adb4aa3ae13c46ececa649cc1a Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Sun, 10 Nov 2024 20:10:46 -0300
Subject: [PATCH] [drape] UserEventStream, one more scale state check.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 drape_frontend/user_event_stream.cpp | 19 ++++++++++++++-----
 qt/draw_widget.cpp                   | 12 ++++--------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/drape_frontend/user_event_stream.cpp b/drape_frontend/user_event_stream.cpp
index 0c364f78e7..8cb0609844 100644
--- a/drape_frontend/user_event_stream.cpp
+++ b/drape_frontend/user_event_stream.cpp
@@ -11,8 +11,6 @@
 #include "drape_frontend/screen_operations.hpp"
 #include "drape_frontend/visual_params.hpp"
 
-#include "platform/platform.hpp"
-
 #include "base/macros.hpp"
 
 #include <cmath>
@@ -766,7 +764,7 @@ bool UserEventStream::ProcessTouch(TouchEvent const & touch)
 
 bool UserEventStream::TouchDown(std::array<Touch, 2> const & touches)
 {
-  size_t touchCount = GetValidTouchesCount(touches);
+  size_t const touchCount = GetValidTouchesCount(touches);
   bool isMapTouch = true;
 
   // Interrupt kinetic scroll on touch down.
@@ -774,6 +772,14 @@ bool UserEventStream::TouchDown(std::array<Touch, 2> const & touches)
 
   if (touchCount == 1)
   {
+    // Transition Scale -> Touch is possible for:
+    // Trackpad where "Touch to click" is off (hardware touch), but Scale/Rotate is a touch only gesture.
+    if (m_state == STATE_SCALE)
+    {
+      ASSERT_EQUAL(GetValidTouchesCount(m_touches), 2, ());
+      EndScale(m_touches[0], m_touches[1]);
+    }
+
     if (!DetectDoubleTap(touches[0]))
     {
       if (m_state == STATE_EMPTY)
@@ -846,6 +852,7 @@ bool UserEventStream::TouchMove(std::array<Touch, 2> const & touches)
     }
     else
     {
+      ASSERT_EQUAL(touchCount, 2, ());
       BeginScale(touches[0], touches[1]);
     }
     break;
@@ -913,7 +920,7 @@ bool UserEventStream::TouchMove(std::array<Touch, 2> const & touches)
 
 bool UserEventStream::TouchCancel(std::array<Touch, 2> const & touches)
 {
-  size_t touchCount = GetValidTouchesCount(touches);
+  size_t const touchCount = GetValidTouchesCount(touches);
   UNUSED_VALUE(touchCount);
   bool isMapTouch = true;
   switch (m_state)
@@ -954,7 +961,7 @@ bool UserEventStream::TouchCancel(std::array<Touch, 2> const & touches)
 
 bool UserEventStream::TouchUp(std::array<Touch, 2> const & touches)
 {
-  size_t touchCount = GetValidTouchesCount(touches);
+  size_t const touchCount = GetValidTouchesCount(touches);
   bool isMapTouch = true;
   switch (m_state)
   {
@@ -1011,6 +1018,8 @@ bool UserEventStream::TouchUp(std::array<Touch, 2> const & touches)
 
 void UserEventStream::UpdateTouches(std::array<Touch, 2> const & touches)
 {
+  ASSERT(m_state != STATE_SCALE || GetValidTouchesCount(touches) == 2, ());
+
   m_touches = touches;
 }
 
diff --git a/qt/draw_widget.cpp b/qt/draw_widget.cpp
index 46558faa7d..80ec7e9130 100644
--- a/qt/draw_widget.cpp
+++ b/qt/draw_widget.cpp
@@ -79,7 +79,6 @@ void DrawMwmBorder(df::DrapeApi & drapeApi, std::string const & mwmName,
   }
 }
 
-#if defined(OMIM_OS_LINUX)
 df::TouchEvent::ETouchType qtTouchEventTypeToDfTouchEventType(QEvent::Type qEventType)
 {
   switch (qEventType)
@@ -91,8 +90,7 @@ df::TouchEvent::ETouchType qtTouchEventTypeToDfTouchEventType(QEvent::Type qEven
     default: return df::TouchEvent::TOUCH_NONE;
   }
 }
-#endif
-}  // namespace
+} // namespace
 
 DrawWidget::DrawWidget(Framework & framework, std::unique_ptr<ScreenshotParams> && screenshotParams,
                        QWidget * parent)
@@ -211,14 +209,12 @@ void DrawWidget::initializeGL()
 
 bool DrawWidget::event(QEvent * event)
 {
-#if !defined(OMIM_OS_LINUX)
-    return QOpenGLWidget::event(event);
-#else
-  auto dfTouchEventType = qtTouchEventTypeToDfTouchEventType(event->type());
+  auto const dfTouchEventType = qtTouchEventTypeToDfTouchEventType(event->type());
   if (dfTouchEventType == df::TouchEvent::TOUCH_NONE)
     return QOpenGLWidget::event(event);
 
   event->accept();
+
   QTouchEvent const * qtTouchEvent = dynamic_cast<QTouchEvent const *>(event);
   df::TouchEvent dfTouchEvent;
   // The SetTouchType hast to be set even if `qtTouchEvent->points()` is empty
@@ -238,9 +234,9 @@ bool DrawWidget::event(QEvent * event)
     else
        dfTouchEvent.SetSecondTouch(touch);
   }
+
   m_framework.TouchEvent(dfTouchEvent);
   return true;
-#endif
 }
 
 void DrawWidget::mousePressEvent(QMouseEvent * e)
-- 
2.45.3