textcursor type to replace textselection

mixins/code_editor.go

@@ -6,9 +6,10 @@ package mixins
 
 import (
 	"fmt"
+	"strings"
+
 	"github.com/google/gxui"
 	"github.com/google/gxui/math"
-	"strings"
 )
 
 type CodeEditorOuter interface {
@@ -192,7 +193,7 @@ func (t *CodeEditor) KeyPress(ev gxui.KeyboardEvent) (consume bool) {
 		if t.IsSuggestionListShowing() {
 			text := t.suggestionAdapter.Suggestion(t.suggestionList.Selected()).Code()
 			s, e := controller.WordAt(t.controller.LastCaret())
-			controller.SetSelection(gxui.CreateTextSelection(s, e, false))
+			controller.SetSelection(gxui.CreateTextCursor(s, e))
 			controller.ReplaceAll(text)
 			controller.Deselect(false)
 			t.HideSuggestionList()

mixins/default_textbox_line.go

@@ -110,7 +110,7 @@ func (t *DefaultTextBoxLine) PaintSelections(c gxui.Canvas) {
 	if t.textbox.selectionDragging {
 		interval.Replace(&selections, t.textbox.selectionDrag)
 	}
-	interval.Visit(&selections, gxui.CreateTextSelection(ls, le, false), func(s, e uint64, _ int) {
+	interval.Visit(&selections, gxui.CreateTextCursor(ls, le), func(s, e uint64, _ int) {
 		if s < e {
 			x := t.outer.MeasureRunes(ls, int(s)).W
 			m := t.outer.MeasureRunes(int(s), int(e))

mixins/textbox.go

@@ -5,10 +5,11 @@
 package mixins
 
 import (
+	"strings"
+
 	"github.com/google/gxui"
 	"github.com/google/gxui/math"
 	"github.com/google/gxui/mixins/parts"
-	"strings"
 )
 
 type TextBoxLine interface {
@@ -36,15 +37,15 @@ type TextBox struct {
 	controller        *gxui.TextBoxController
 	adapter           *TextBoxAdapter
 	selectionDragging bool
-	selectionDrag     gxui.TextSelection
+	selectionDrag     gxui.TextCursor
 	desiredWidth      int
 }
 
 func (t *TextBox) lineMouseDown(line TextBoxLine, ev gxui.MouseEvent) {
 	if ev.Button == gxui.MouseButtonLeft {
 		p := line.RuneIndexAt(ev.Point)
 		t.selectionDragging = true
-		t.selectionDrag = gxui.CreateTextSelection(p, p, false)
+		t.selectionDrag = gxui.TextCursor{Index: p}
 		if !ev.Modifier.Control() {
 			t.controller.SetCaret(p)
 		}
@@ -165,12 +166,14 @@ func (t *TextBox) SetDesiredWidth(desiredWidth int) {
 	}
 }
 
-func (t *TextBox) Select(sel gxui.TextSelectionList) {
+func (t *TextBox) Select(sel gxui.TextCursorList) {
 	t.controller.StoreCaretLocations()
 	t.controller.SetSelections(sel)
 	// Use two scroll tos to try and display all selections (if it fits on screen)
-	t.ScrollToRune(t.controller.FirstSelection().First())
-	t.ScrollToRune(t.controller.LastSelection().Last())
+	firstStart, _ := t.controller.FirstSelection().Range()
+	_, lastEnd := t.controller.LastSelection().Range()
+	t.ScrollToRune(firstStart)
+	t.ScrollToRune(lastEnd - 1)
 }
 
 func (t *TextBox) SelectAll() {
@@ -407,11 +410,11 @@ func (t *TextBox) Click(ev gxui.MouseEvent) (consume bool) {
 
 func (t *TextBox) DoubleClick(ev gxui.MouseEvent) (consume bool) {
 	if p, ok := t.RuneIndexAt(ev.Point); ok {
-		s, e := t.controller.WordAt(p)
+		c := gxui.CreateTextCursor(t.controller.WordAt(p))
 		if ev.Modifier&gxui.ModControl != 0 {
-			t.controller.AddSelection(gxui.CreateTextSelection(s, e, false))
+			t.controller.AddSelection(c)
 		} else {
-			t.controller.SetSelection(gxui.CreateTextSelection(s, e, false))
+			t.controller.SetSelection(c)
 		}
 	}
 	t.InputEventHandler.DoubleClick(ev)
@@ -422,7 +425,8 @@ func (t *TextBox) MouseMove(ev gxui.MouseEvent) {
 	t.List.MouseMove(ev)
 	if t.selectionDragging {
 		if p, ok := t.RuneIndexAt(ev.Point); ok {
-			t.selectionDrag = gxui.CreateTextSelection(t.selectionDrag.From(), p, false)
+			idx := t.selectionDrag.Index + t.selectionDrag.Length
+			t.selectionDrag = gxui.CreateTextCursor(idx, p)
 			t.selectionDragging = true
 			t.onRedrawLines.Fire()
 		}

textbox.go

@@ -25,7 +25,7 @@ type TextBox interface {
 	SetDesiredWidth(desiredWidth int)
 	TextColor() Color
 	SetTextColor(Color)
-	Select(TextSelectionList)
+	Select(TextCursorList)
 	SelectAll()
 	Carets() []int
 	RuneIndexAt(p math.Point) (idx int, found bool)