PRJ-92 Clarify which drag event is generated: touch or mouse

JetBrains · Jul 21, 2020 · b8dd756 · b8dd756
1 parent 0eeb3e9
commit b8dd756
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/...or-client-web/src/main/kotlin/org/jetbrains/projector/client/web/input/InputController.kt b/...or-client-web/src/main/kotlin/org/jetbrains/projector/client/web/input/InputController.kt
@@ -81,7 +81,7 @@ class InputController(private val openingTimeStamp: Int,
         eventsInterceptor!!.onMouseMove(touch.clientX, touch.clientY)
       }
       else {
-        fireMouseEvent(ClientMouseEvent.MouseEventType.DRAG, event, touch)
+        fireMouseEvent(ClientMouseEvent.MouseEventType.TOUCH_DRAG, event, touch)
       }
     }
   }

diff --git a/...ommon/src/commonMain/kotlin/org/jetbrains/projector/common/protocol/handshake/Constant.kt b/...ommon/src/commonMain/kotlin/org/jetbrains/projector/common/protocol/handshake/Constant.kt
@@ -35,5 +35,6 @@ val COMMON_VERSION = listOf(ServerEvent.serializer(), ClientEvent.serializer())
 // Don't change order here: it's used to obtain readable "human id"
 val commonVersionList = listOf(
   -1663032476,
-  615706807
+  615706807,
+  891030124
 )
diff --git a/...mon/src/commonMain/kotlin/org/jetbrains/projector/common/protocol/toServer/ClientEvent.kt b/...mon/src/commonMain/kotlin/org/jetbrains/projector/common/protocol/toServer/ClientEvent.kt
@@ -72,6 +72,7 @@ data class ClientMouseEvent(
   enum class MouseEventType {
     MOVE,
     DRAG,
+    TOUCH_DRAG,
     DOWN,
     UP,
     CLICK,
-Original file line number
+Diff line change
@@ Expand Up / @@ -81,7 +81,7 @@ class InputController(private val openingTimeStamp: Int, @@
             eventsInterceptor!!.onMouseMove(touch.clientX, touch.clientY)
           }
           else {
-            fireMouseEvent(ClientMouseEvent.MouseEventType.DRAG, event, touch)
+            fireMouseEvent(ClientMouseEvent.MouseEventType.TOUCH_DRAG, event, touch)
           }
         }
       }
@@ Expand Down @@