ui/textview: Add FontSize property

roblillack · May 22, 2024 · 18a4ae0 · 18a4ae0
1 parent fdbaee1
commit 18a4ae0
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 15 deletions.
diff --git a/examples/hello-spot/main.go b/examples/hello-spot/main.go
@@ -210,10 +210,10 @@ func main() {
 				&ui.Label{X: 210, Y: 100, Width: 180, Height: 25, Value: "Current backend:"},
 				&BlinkingLabel{X: 210, Y: 120, Width: 180, Height: 30, Text: ui.BackendName, Size: 20},
 				spot.Make(QuitButton),
-				&ui.TextField{
+				&ui.TextView{
 					X: 10, Y: 10, Width: 380, Height: 80,
-					Value:    randText,
-					FontSize: 11,
+					Text: randText,
+					// FontSize: 11,
 					// Editable: false, Selectable: false, Bezeled: false, NoBackground: false,
 				},
 			},

diff --git a/ui/textview.go b/ui/textview.go
@@ -3,12 +3,13 @@ package ui
 import "github.com/roblillack/spot"
 
 type TextView struct {
-	X      int
-	Y      int
-	Width  int
-	Height int
-	Text   string
-	ref    nativeTypeTextView
+	X        int
+	Y        int
+	Width    int
+	Height   int
+	Text     string
+	FontSize int
+	ref      nativeTypeTextView
 }
 
 var _ spot.Component = &TextView{}

diff --git a/ui/textview_cocoa.go b/ui/textview_cocoa.go
@@ -7,7 +7,7 @@ import (
 	"github.com/roblillack/spot"
 )
 
-type nativeTypeTextView = *gocoa.TextView
+type nativeTypeTextView = *gocoa.TextField
 
 func (w *TextView) Update(nextComponent spot.Control) bool {
 	next, ok := nextComponent.(*TextView)
@@ -17,7 +17,12 @@ func (w *TextView) Update(nextComponent spot.Control) bool {
 
 	if next.Text != w.Text {
 		w.Text = next.Text
-		w.ref.SetText(w.Text)
+		w.ref.SetStringValue(w.Text)
+	}
+
+	if next.FontSize != w.FontSize && w.FontSize > 0 {
+		w.FontSize = next.FontSize
+		w.ref.SetFontSize(w.FontSize)
 	}
 
 	return true
@@ -28,11 +33,17 @@ func (w *TextView) Mount(parent spot.Control) any {
 		return w.ref
 	}
 
-	w.ref = gocoa.NewTextView(w.X, w.Y, w.Width, w.Height)
-	w.ref.SetText(w.Text)
+	w.ref = gocoa.NewTextField(w.X, w.Y, w.Width, w.Height)
+	w.ref.SetStringValue(w.Text)
+	w.ref.SetFontFamily("Arial")
+	w.ref.SetEditable(false)
+	w.ref.SetSelectable(true)
+	if w.FontSize > 0 {
+		w.ref.SetFontSize(w.FontSize)
+	}
 
 	if window, ok := parent.(*Window); ok && window != nil && window.ref != nil {
-		window.ref.AddTextView(w.ref)
+		window.ref.AddTextField(w.ref)
 	}
 
 	return w.ref

diff --git a/ui/textview_fltk.go b/ui/textview_fltk.go
@@ -32,7 +32,7 @@ func (w *TextView) Mount(parent spot.Control) any {
 	w.ref = goFltk.NewTextDisplay(w.X, w.Y, w.Width, w.Height)
 	w.ref.SetBuffer(goFltk.NewTextBuffer())
 	w.ref.Buffer().SetText(w.Text)
-	w.ref.Deactivate()
+	// w.ref.Deactivate()
 	w.ref.SetWrapMode(goFltk.WRAP_AT_BOUNDS, 0)
 
 	if window, ok := parent.(*Window); ok && window != nil && window.ref != nil {