Fix issue #16: showing the tick at start of selection

rjkroege · Apr 1, 2018 · fb09b37 · fb09b37
1 parent a03a1b1
commit fb09b37
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 1 deletion.
diff --git a/frame/draw.go b/frame/draw.go
@@ -74,6 +74,7 @@ func (f *Frame) DrawSel(pt image.Point, p0, p1 int, highlighted bool) {
 	// If we should just show the tick, do that and return.
 	if p0 == p1 {
 		f.Tick(pt, highlighted)
+		f.Display.Flush() // To show the tick.
 		f.P0 = p0
 		f.P1 = p1
 		return

diff --git a/text.go b/text.go
@@ -1307,11 +1307,47 @@ func (t *Text) SetSelect(q0, q1 int) {
 	if p1 > (t.fr.GetFrameFillStatus().Nchars) {
 		p1 = (t.fr.GetFrameFillStatus().Nchars)
 	}
+	if(p0==getP0(t.fr) && p1==getP1(t.fr)){
+		if(p0 == p1 && ticked != t.fr.Ticked) {
+			t.fr.Tick(t.fr.Ptofchar(p0), ticked);
+		}
+		return;
+	}
 	if p0 > p1 {
 		panic(fmt.Sprintf("acme: textsetselect p0=%d p1=%d q0=%v q1=%v t.org=%d nchars=%d", p0, p1, q0, q1, t.org, t.fr.GetFrameFillStatus().Nchars))
 	}
 
-	t.fr.DrawSel(t.fr.Ptofchar(p0), p0, p1, ticked)
+	/* screen disagrees with desired selection */
+	if getP1(t.fr)<=p0 || p1<=getP0(t.fr) || p0==p1 || getP1(t.fr)==getP0(t.fr) {
+		/* no overlap or too easy to bother trying */
+		t.fr.DrawSel(t.fr.Ptofchar(getP0(t.fr)), getP0(t.fr), getP1(t.fr), false);
+		if p0 != p1 || ticked {
+			t.fr.DrawSel(t.fr.Ptofchar(p0), p0, p1, true);
+		}
+		goto Return;
+	}
+	/* overlap; avoid unnecessary painting */
+	if p0 < getP0(t.fr) {
+		/* extend selection backwards */
+		t.fr.DrawSel(t.fr.Ptofchar(p0), p0, getP0(t.fr), true);
+	}else { 
+		if p0 > getP0(t.fr) {
+			/* trim first part of selection */
+			t.fr.DrawSel(t.fr.Ptofchar(getP0(t.fr)), getP0(t.fr), p0, false);
+		}
+	}
+	if p1 > getP1(t.fr) {
+		/* extend selection forwards */
+		t.fr.DrawSel(t.fr.Ptofchar(getP1(t.fr)), getP1(t.fr), p1, true);
+	}else {
+		if p1 < getP1(t.fr) {
+			/* trim last part of selection */
+			t.fr.DrawSel(t.fr.Ptofchar(p1), p1, getP1(t.fr), false);
+		}
+	}
+
+    Return:
+	t.fr.SetSelectionExtent(p0,p1)
 }
 
 func selrestore(f *frame.Frame, pt0 image.Point, p0, p1 int) {