feat: replace span single click with Ctrl+Click and ignore cursor pos…

…ition when the user is using mouse
Rosemoe · Feb 11, 2024 · 415fe59 · 415fe59
1 parent 55bb553
commit 415fe59
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/editor/src/main/java/io/github/rosemoe/sora/widget/ext/EditorSpanInteractionHandler.kt b/editor/src/main/java/io/github/rosemoe/sora/widget/ext/EditorSpanInteractionHandler.kt
@@ -59,32 +59,38 @@ open class EditorSpanInteractionHandler(val editor: CodeEditor) {
 
     init {
         eventManager.subscribeAlways<ClickEvent> { event ->
-            handleInteractionEvent(
-                event,
-                SpanInteractionInfo::isClickable,
-                ::handleSpanClick
-            )
+            if (!event.isFromMouse || (event.isFromMouse && editor.keyMetaStates.isCtrlPressed)) {
+                handleInteractionEvent(
+                    event,
+                    SpanInteractionInfo::isClickable,
+                    ::handleSpanClick,
+                    !event.isFromMouse
+                )
+            }
         }
         eventManager.subscribeAlways<DoubleClickEvent> { event ->
             handleInteractionEvent(
                 event,
                 SpanInteractionInfo::isDoubleClickable,
-                ::handleSpanDoubleClick
+                ::handleSpanDoubleClick,
+                !event.isFromMouse
             )
         }
         eventManager.subscribeAlways<LongPressEvent> { event ->
             handleInteractionEvent(
                 event,
                 SpanInteractionInfo::isLongClickable,
-                ::handleSpanLongClick
+                ::handleSpanLongClick,
+                !event.isFromMouse
             )
         }
     }
 
     private fun handleInteractionEvent(
         event: EditorMotionEvent,
         predicate: (interactionInfo: SpanInteractionInfo) -> Boolean,
-        handler: (Span, SpanInteractionInfo, TextRange) -> Boolean
+        handler: (Span, SpanInteractionInfo, TextRange) -> Boolean,
+        checkCursorRange: Boolean = true
     ) {
         val regionInfo = editor.resolveTouchRegion(event.causingEvent)
         val span = event.span
@@ -93,7 +99,7 @@ open class EditorSpanInteractionHandler(val editor: CodeEditor) {
             IntPair.getSecond(regionInfo) == IN_BOUND &&
             span != null && spanRange != null
         ) {
-            if (spanRange.isPositionInside(editor.cursor.left())) {
+            if (!checkCursorRange || spanRange.isPositionInside(editor.cursor.left())) {
                 span.getSpanExt<SpanInteractionInfo>(SpanExtAttrs.EXT_INTERACTION_INFO)?.let {
                     if (predicate(it)) {
                         if (handler(span, it, spanRange)) {