Update tile library version

Author: codeation

go.mod

@@ -4,7 +4,7 @@ go 1.23.3
 
 require (
 	github.com/codeation/impress v0.5.1
-	github.com/codeation/tile v0.1.4
+	github.com/codeation/tile v0.1.5
 )
 
 require github.com/codeation/lru v1.3.0 // indirect

go.sum

@@ -2,5 +2,5 @@ github.com/codeation/impress v0.5.1 h1:gZ+lgfB0n184njpaBp7/w5rq7fEJKu5bKH8kmGFCw
 github.com/codeation/impress v0.5.1/go.mod h1:N1e3oKqfkN4c2tfobkZTIpsklzdRby4OaJrOYQutKXc=
 github.com/codeation/lru v1.3.0 h1:BZlD5G4bt0bis9FHV5q3zyyDCAx21ue2CvvM1T8hQl4=
 github.com/codeation/lru v1.3.0/go.mod h1:1C9+zUoRETpelIbMxh6wj9APf2VnKh0tk9aRsrOQUsk=
-github.com/codeation/tile v0.1.4 h1:BZcYNjc28q7vqCte1rW8dF88XbJUF8yqXNzVSj7GXuk=
-github.com/codeation/tile v0.1.4/go.mod h1:b1jBEAaEvDPHyzRxbc/zSnT7id6LMnFW4U0A95OpjeQ=
+github.com/codeation/tile v0.1.5 h1:5RT5lE030Vay2bp3VB8X1NURpaJLZDE1ZisK8oB6otU=
+github.com/codeation/tile v0.1.5/go.mod h1:b1jBEAaEvDPHyzRxbc/zSnT7id6LMnFW4U0A95OpjeQ=

mapcontrol/control.go

@@ -23,6 +23,12 @@ var keypadEnter = event.Keyboard{
 	Name: "KP_Enter",
 }
 
+var keyShiftEnter = event.Keyboard{
+	Rune:  13,
+	Shift: true,
+	Name:  "Return",
+}
+
 type Control struct {
 	mapModel *mapmodel.MindMap
 	mapView  *mapview.View
@@ -101,6 +107,9 @@ func (c *Control) Action(ctx context.Context, app eventlink.App) {
 				c.mapModel.Backspace()
 				c.modView.Set(true)
 			}
+		case keyShiftEnter:
+			c.mapModel.InsertNL()
+			c.modView.Set(true)
 
 		case event.KeyCopy, menuevent.Copy:
 			c.appClip.Put(c.mapModel.Selected.Value.String())

mapmodel/model.go

@@ -12,6 +12,7 @@ type MindMap struct {
 
 func New(source *xmlfile.Node, filename string) *MindMap {
 	root := newXMLNode(source, nil)
+	root.Value.End()
 	return &MindMap{
 		Root:     root,
 		Selected: root,
@@ -24,6 +25,7 @@ func (m *MindMap) Export() *xmlfile.Node {
 }
 
 func (m *MindMap) Select(node *Node) {
+	m.Selected.Value.Home()
 	m.Selected = node
 	m.Selected.Value.End()
 }
@@ -34,39 +36,45 @@ func (m *MindMap) Every(fn func(node *Node)) {
 
 func (m *MindMap) Down() {
 	if node := m.Selected.down(); node != nil {
+		m.Selected.Value.Home()
 		m.Selected = node
 		m.Selected.Value.End()
 	}
 }
 
 func (m *MindMap) Up() {
 	if node := m.Selected.up(); node != nil {
+		m.Selected.Value.Home()
 		m.Selected = node
 		m.Selected.Value.End()
 	}
 }
 
 func (m *MindMap) NewChildNode() {
+	m.Selected.Value.Home()
 	m.Selected = m.Selected.newChild()
 }
 
 func (m *MindMap) NewNextNode() {
 	if m.Selected == m.Root {
 		return
 	}
+	m.Selected.Value.Home()
 	m.Selected = m.Selected.newNext()
 }
 
 func (m *MindMap) DeleteNode() {
 	if m.Selected == m.Root {
 		return
 	}
+	m.Selected.Value.Home()
 	m.Selected = m.Selected.remove()
 	m.Selected.Value.End()
 }
 
 func (m *MindMap) Adopt(node *Node, newParent *Node, beforeNode *Node) {
 	newParent.insertBefore(node, beforeNode)
+	m.Selected.Value.Home()
 	m.Selected = node
 	m.Selected.Value.End()
 }
@@ -83,6 +91,10 @@ func (m *MindMap) Insert(alpha rune) {
 	m.Selected.Value.Insert(alpha)
 }
 
+func (m *MindMap) InsertNL() {
+	m.Selected.Value.InsertNL()
+}
+
 func (m *MindMap) Backspace() {
 	m.Selected.Value.Backspace()
 }

mapmodel/node.go

@@ -20,6 +20,7 @@ func newXMLNode(elem *xmlfile.Node, parent *Node) *Node {
 		Parent: parent,
 		Childs: make([]*Node, 0, len(elem.Childs)),
 	}
+	node.Value.Home()
 	if len(elem.Childs) == 0 {
 		return node
 	}

mapview/nodeview.go

@@ -11,7 +11,6 @@ import (
 	"github.com/codeation/tile/view/fn"
 	"github.com/codeation/tile/view/margin"
 	"github.com/codeation/tile/view/minsize"
-	"github.com/codeation/tile/view/textview"
 
 	"github.com/codeation/lineation/mapmodel"
 	"github.com/codeation/lineation/palette"
@@ -45,15 +44,13 @@ func (v *View) nodeViewer(node *mapmodel.Node) view.Viewer {
 		return image.Pt(v.pal.BoxWidth(node.Level())-v.pal.TextAlign().X*2, 0)
 	}
 	var viewer view.Viewer
-	viewer = textview.New(
-		fieldview.WithFocused(node.Value, isChangeableFn),
-		v.pal.DefaultFont(),
-		v.pal.DefaultFont().Height+v.pal.TextLineOffset(),
-		defaultTextColor,
-		cursor,
-	)
-	viewer = minsize.New(viewer, nodeSizeFn)
-	viewer = margin.New(viewer, textMargin)
+	viewer = fieldview.New(fieldview.WithFocused(node.Value, isChangeableFn),
+		v.pal.DefaultFont(), defaultTextColor).
+		LineHeight(v.pal.DefaultFont().Height + v.pal.TextLineOffset()).
+		WithCursor(cursor).
+		MaxRows(v.pal.MaxRows())
+	viewer = minsize.New(viewer).MinSize(nodeSizeFn)
+	viewer = margin.New(viewer).Margin(textMargin)
 	viewer = box.New(
 		viewer,
 		fn.If(isSelectedFn, activeForegroundColor, defaultForegroundColor),

palette/config.go

@@ -16,9 +16,10 @@ type configWindow struct {
 }
 
 type configBoxes struct {
-	Align  configSize `json:"align"`
-	Offset configSize `json:"offset"`
-	Widths []int      `json:"widths"`
+	Align   configSize `json:"align"`
+	Offset  configSize `json:"offset"`
+	Widths  []int      `json:"widths"`
+	MaxRows int        `json:"max_rows"`
 }
 
 type configDialogs struct {
@@ -57,9 +58,10 @@ func defaultConfig() *Config {
 			Size: configSize{Width: 1280, Height: 768},
 		},
 		Boxes: configBoxes{
-			Align:  configSize{Width: 20, Height: 16},
-			Offset: configSize{Width: 50, Height: 16},
-			Widths: []int{100, 140, 300},
+			Align:   configSize{Width: 20, Height: 16},
+			Offset:  configSize{Width: 50, Height: 16},
+			Widths:  []int{100, 140, 300},
+			MaxRows: 0,
 		},
 		Dialogs: configDialogs{
 			Align:  configSize{Width: 20, Height: 16},

palette/palette.go

@@ -88,6 +88,10 @@ func (p *Palette) Columns() int {
 	return len(p.config.Boxes.Widths)
 }
 
+func (p *Palette) MaxRows() int {
+	return p.config.Boxes.MaxRows
+}
+
 func (p *Palette) BoxWidth(level int) int {
 	if level <= len(p.config.Boxes.Widths) {
 		return p.config.Boxes.Widths[level-1]