Modify caret

naotsugu · Jan 28, 2024 · 2eeb015 · 2eeb015
1 parent fbeba3c
commit 2eeb015
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 6 deletions.
diff --git a/modules/ui-model/src/main/java/com/mammb/code/editor/ui/model/CaretMulti.java b/modules/ui-model/src/main/java/com/mammb/code/editor/ui/model/CaretMulti.java
@@ -20,4 +20,9 @@
  * @author Naotsugu Kobayashi
  */
 public interface CaretMulti extends Caret {
+
+    void add(long charOffset);
+
+    void clear();
+
 }
diff --git a/modules/ui-model/src/main/java/com/mammb/code/editor/ui/model/EditorModel.java b/modules/ui-model/src/main/java/com/mammb/code/editor/ui/model/EditorModel.java
@@ -128,7 +128,7 @@ public interface EditorModel extends EditorDraw {
 
     // -- mouse behavior ------------------------------------------------------
 
-    void click(double x, double y);
+    void click(double x, double y, boolean isShortcutDown);
     void clickDouble(double x, double y);
     void clickTriple(double x, double y);
     void dragged(double x, double y);

diff --git a/modules/ui-model/src/main/java/com/mammb/code/editor/ui/model/impl/CaretCore.java b/modules/ui-model/src/main/java/com/mammb/code/editor/ui/model/impl/CaretCore.java
@@ -36,15 +36,20 @@ public class CaretCore implements CaretMulti {
     /** The planets. */
     private final List<Caret> planets;
 
+    /** The offset to layout line function. */
+    private final Function<Long, LayoutLine> offsetToLine;
+
 
     /**
      * Constructor.
      * @param core the core caret
      * @param planets the planets
+     * @param offsetToLine the offset to layout line function
      */
-    private CaretCore(Caret core, List<Caret> planets) {
+    private CaretCore(Caret core, List<Caret> planets, Function<Long, LayoutLine> offsetToLine) {
         this.core = core;
         this.planets = planets;
+        this.offsetToLine = offsetToLine;
     }
 
 
@@ -56,11 +61,26 @@ private CaretCore(Caret core, List<Caret> planets) {
     public static CaretMulti of(Function<Long, LayoutLine> offsetToLine) {
         return new CaretCore(
             new CaretImpl(offsetToLine),
-            new ArrayList<>()
+            new ArrayList<>(),
+            offsetToLine
         );
     }
 
 
+    @Override
+    public void add(long charOffset) {
+        Caret planet = new CaretImpl(offsetToLine);
+        planet.at(charOffset, true);
+        planets.add(planet);
+    }
+
+    @Override
+    public void clear() {
+        planets.clear();
+    }
+
+
+
     @Override
     public void draw(GraphicsContext gc, double margin, double hScrolled) {
         core.draw(gc, margin, hScrolled);

diff --git a/modules/ui-model/src/main/java/com/mammb/code/editor/ui/model/impl/EditorModelImpl.java b/modules/ui-model/src/main/java/com/mammb/code/editor/ui/model/impl/EditorModelImpl.java
@@ -590,15 +590,19 @@ public void vScrolled(int oldValue, int newValue) {
 
     // <editor-fold defaultstate="collapsed" desc="mouse behavior">
     @Override
-    public void click(double x, double y) {
+    public void click(double x, double y, boolean isShortcutDown) {
         if (selection.isDragging()) {
             selection.to(caret.caretPoint());
             selection.endDragging();
             return;
         }
         selection.clear();
         long offset = texts.at(x - screen.textLeft(), y);
-        caret.at(offset, true);
+        if (isShortcutDown) {
+            caret.add(offset);
+        } else {
+            caret.at(offset, true);
+        }
     }
     @Override
     public void clickDouble(double x, double y) {

diff --git a/modules/ui-pane/src/main/java/com/mammb/code/editor/ui/pane/EditorPane.java b/modules/ui-pane/src/main/java/com/mammb/code/editor/ui/pane/EditorPane.java
@@ -260,7 +260,7 @@ private void handleMouseClicked(MouseEvent e) {
         canvas.requestFocus();
         if (e.getButton() == MouseButton.PRIMARY && e.getTarget() == canvas) {
             switch (e.getClickCount()) {
-                case 1 -> model.click(e.getX(), e.getY());
+                case 1 -> model.click(e.getX(), e.getY(), e.isShortcutDown());
                 case 2 -> model.clickDouble(e.getX(), e.getY());
                 case 3 -> model.clickTriple(e.getX(), e.getY());
             }