Fix jumpy content in area caused by wrong cursorPosY

atomicgo · Jul 27, 2023 · d5f4f59 · d5f4f59
1 parent 7738fd3
commit d5f4f59
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/area.go b/area.go
@@ -2,6 +2,7 @@ package cursor
 
 import (
 	"os"
+	"strings"
 )
 
 // Area displays content which can be updated on the fly.
@@ -48,6 +49,14 @@ func (area *Area) Clear() {
 	}
 }
 
+// Update overwrites the content of the Area and adjusts its height based on content.
+func (area *Area) Update(content string) {
+	area.Clear()
+	area.writeArea(content)
+	area.cursorPosY = 0
+	area.height = strings.Count(content, "\n")
+}
+
 // Up moves the cursor of the area up one line.
 func (area *Area) Up(n int) {
 	if n > 0 {
@@ -88,7 +97,7 @@ func (area *Area) Top() {
 	if area.cursorPosY < area.height {
 		area.Up(area.height - area.cursorPosY - 1)
 		area.StartOfLine()
-		area.cursorPosY = 0
+		area.cursorPosY = area.height
 	}
 }
 

diff --git a/area_other.go b/area_other.go
@@ -5,13 +5,9 @@ package cursor
 
 import (
 	"fmt"
-	"strings"
 )
 
 // Update overwrites the content of the Area and adjusts its height based on content.
-func (area *Area) Update(content string) {
-	area.Clear()
+func (area *Area) writeArea(content string) {
 	fmt.Fprint(area.writer, content)
-	// Detect height of cursor area
-	area.height = strings.Count(content, "\n")
 }