updated preferred column when using mouse (fixes #5)

Nimaoth · Jan 7, 2024 · fcd2f99 · fcd2f99
1 parent 2ab9bc5
commit fcd2f99
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/config/absytree_config.nim b/config/absytree_config.nim
@@ -82,9 +82,9 @@ when defined(wasm):
   loadVimLikeKeybindings()
 
   # Triple click to selects a line
-  setOption("editor.text.triple-click-command", "extend-select-move")
-  setOption("editor.text.triple-click-command-args", %[%"line", %true])
+  setOption "editor.text.triple-click-command", "extend-select-move"
+  setOption "editor.text.triple-click-command-args", %[%"line", %true]
 
   # Triple click selects a vim paragraph
-  # setOption("editor.text.triple-click-command", "extend-select-move")
-  # setOption("editor.text.triple-click-command-args", %[%"vim-paragraph-inner", %true])
+  # setOption "editor.text.triple-click-command", "extend-select-move"
+  # setOption "editor.text.triple-click-command-args", %[%"vim-paragraph-inner", %true]
diff --git a/src/text/text_editor.nim b/src/text/text_editor.nim
@@ -96,7 +96,7 @@ proc showCompletionWindow(self: TextDocumentEditor)
 proc refilterCompletions(self: TextDocumentEditor)
 proc getSelectionForMove*(self: TextDocumentEditor, cursor: Cursor, move: string, count: int = 0): Selection
 proc extendSelectionWithMove*(self: TextDocumentEditor, selection: Selection, move: string, count: int = 0): Selection
-proc updateTargetColumn(self: TextDocumentEditor, cursor: SelectionCursor)
+proc updateTargetColumn*(self: TextDocumentEditor, cursor: SelectionCursor)
 
 proc clampCursor*(self: TextDocumentEditor, cursor: Cursor): Cursor = self.document.clampCursor(cursor)
 
@@ -474,7 +474,7 @@ proc getContextWithMode(self: TextDocumentEditor, context: string): string {.exp
   ## Appends the current mode to context
   return context & "." & $self.currentMode
 
-proc updateTargetColumn(self: TextDocumentEditor, cursor: SelectionCursor) {.expose("editor.text").} =
+proc updateTargetColumn*(self: TextDocumentEditor, cursor: SelectionCursor) {.expose("editor.text").} =
   self.targetColumn = self.getCursor(cursor).column
 
 proc invertSelection(self: TextDocumentEditor) {.expose("editor.text").} =

diff --git a/src/ui/widget_builder_text_document.nim b/src/ui/widget_builder_text_document.nim
@@ -147,20 +147,23 @@ proc renderLine*(
                   self.selection = (line.index, offset).toSelection
                   self.dragStartSelection = self.selection
                   self.runSingleClickCommand()
+                  self.updateTargetColumn(Last)
                   self.app.tryActivateEditor(self)
                   self.markDirty()
                 elif btn == DoubleClick:
                   let offset = self.getCursorPos(textRuneLen, line.index, startRune.RuneIndex, pos)
                   self.selection = (line.index, offset).toSelection
                   self.dragStartSelection = self.selection
                   self.runDoubleClickCommand()
+                  self.updateTargetColumn(Last)
                   self.app.tryActivateEditor(self)
                   self.markDirty()
                 elif btn == TripleClick:
                   let offset = self.getCursorPos(textRuneLen, line.index, startRune.RuneIndex, pos)
                   self.selection = (line.index, offset).toSelection
                   self.dragStartSelection = self.selection
                   self.runTripleClickCommand()
+                  self.updateTargetColumn(Last)
                   self.app.tryActivateEditor(self)
                   self.markDirty()
 
@@ -175,6 +178,7 @@ proc renderLine*(
                     currentSelection.last
                   self.selection = (first, newCursor)
                   self.runDragCommand()
+                  self.updateTargetColumn(Last)
                   self.app.tryActivateEditor(self)
                   self.markDirty()
 
@@ -215,17 +219,20 @@ proc renderLine*(
                 self.dragStartSelection = self.selection
                 self.app.tryActivateEditor(self)
                 self.runSingleClickCommand()
+                self.updateTargetColumn(Last)
                 self.markDirty()
               elif btn == DoubleClick:
                 self.selection = (line.index, self.document.lineLength(line.index)).toSelection
                 self.dragStartSelection = self.selection
                 self.runDoubleClickCommand()
+                self.updateTargetColumn(Last)
                 self.app.tryActivateEditor(self)
                 self.markDirty()
               elif btn == TripleClick:
                 self.selection = (line.index, self.document.lineLength(line.index)).toSelection
                 self.dragStartSelection = self.selection
                 self.runTripleClickCommand()
+                self.updateTargetColumn(Last)
                 self.app.tryActivateEditor(self)
                 self.markDirty()
 
@@ -239,6 +246,7 @@ proc renderLine*(
                   currentSelection.last
                 self.selection = (first, newCursor)
                 self.runDragCommand()
+                self.updateTargetColumn(Last)
                 self.app.tryActivateEditor(self)
                 self.markDirty()