Update Tomo API to v0.41.1

.editorconfig

@@ -0,0 +1,12 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+indent_style = tab
+indent_size = 8
+charset = utf-8
+
+[*.md]
+indent_style = space
+indent_size = 2

dialog.go

@@ -63,7 +63,7 @@ func NewDialog (kind DialogKind, parent tomo.Window, title, message string, opti
 		}
 	}
 	dialog.controlRow = NewInnerContainer(layouts.ContractHorizontal, options...)
-	messageText.SetAttr(tomo.AAlign(tomo.AlignEnd, tomo.AlignEnd))
+	dialog.controlRow.SetAttr(tomo.AAlign(tomo.AlignEnd, tomo.AlignEnd))
 
 	dialog.SetRoot(NewOuterContainer (
 		layouts.Column { true, false },

go.mod

@@ -2,6 +2,6 @@ module git.tebibyte.media/tomo/objects
 
 go 1.20
 
-require git.tebibyte.media/tomo/tomo v0.41.0
+require git.tebibyte.media/tomo/tomo v0.41.1
 
 require golang.org/x/image v0.11.0 // indirect

go.sum

@@ -1,5 +1,5 @@
-git.tebibyte.media/tomo/tomo v0.41.0 h1:Z+7FHhbGiKjs+kQNvuJOfz47xIct5qxvSJqyDuoNIOs=
+git.tebibyte.media/tomo/tomo v0.41.1 h1:XdbyF3VjsLj1Zppr70gUaufuh49hU32JQo2ENnw4PcA=
-git.tebibyte.media/tomo/tomo v0.41.0/go.mod h1:C9EzepS9wjkTJjnZaPBh22YvVPyA4hbBAJVU20Rdmps=
+git.tebibyte.media/tomo/tomo v0.41.1/go.mod h1:C9EzepS9wjkTJjnZaPBh22YvVPyA4hbBAJVU20Rdmps=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=

heading.go

@@ -18,6 +18,8 @@ func NewHeading (level int, text string) *Heading {
 	this.SetRole(tomo.R("objects", "Heading"))
 	this.SetTag(fmt.Sprint(level), true)
 	this.SetText(text)
+	this.SetSelectable(true)
+	this.SetFocusable(true)
 	return this
 }
 

label.go

@@ -13,5 +13,7 @@ func NewLabel (text string) *Label {
 	this.SetRole(tomo.R("objects", "Label"))
 	this.SetText(text)
 	this.SetAttr(tomo.AAlign(tomo.AlignStart, tomo.AlignMiddle))
+	this.SetSelectable(true)
+	this.SetFocusable(true)
 	return this
 }

layouts/flow.go

@@ -45,13 +45,14 @@ func (flow Flow) Arrange (hints tomo.LayoutHints, boxes tomo.BoxArranger) {
 	index := 0
 	for index < boxes.Len() {
 		// get a slice of boxes for this major step
+		stepIndexStart := index
 		stepIndexEnd   := index + minorSteps
 		if stepIndexEnd > boxes.Len() { stepIndexEnd = boxes.Len() }
 		index += minorSteps
 		
 		// find a major size that will fit all boxes on this major step
 		majorSize := 0
-		for index := index; index < stepIndexEnd; index ++ {
+		for index := stepIndexStart; index < stepIndexEnd; index ++ {
 			boxSize := flow.major(boxes.MinimumSize(index))
 			if boxSize > majorSize { majorSize = boxSize }
 		}
@@ -61,7 +62,7 @@ func (flow Flow) Arrange (hints tomo.LayoutHints, boxes tomo.BoxArranger) {
 		var size image.Point
 		size = flow.incrMajor(size, majorSize)
 		size = flow.incrMinor(size, minorSize)
-		for index := index; index < stepIndexEnd; index ++ {
+		for index := stepIndexStart; index < stepIndexEnd; index ++ {
 			bounds := image.Rectangle { Min: point, Max: point.Add(size) }
 			boxes.SetBounds(index, bounds)
 

layouts/rowcol.go

@@ -50,7 +50,7 @@ func (column Column) Arrange (hints tomo.LayoutHints, boxes tomo.BoxArranger) {
 	if !hints.OverflowY {
 		gaps       := boxes.Len() - 1
 		freeSpace  := float64(hints.Bounds.Dy() - hints.Gap.Y * gaps)
-		nExpanding := 0;
+		nExpanding := 0
 		for index := 0; index < boxes.Len(); index ++ {
 			if expands(index) {
 				nExpanding ++
@@ -121,7 +121,7 @@ func (row Row) Arrange (hints tomo.LayoutHints, boxes tomo.BoxArranger) {
 	if !hints.OverflowY {
 		gaps       := boxes.Len() - 1
 		freeSpace  := float64(hints.Bounds.Dx() - hints.Gap.X * gaps)
-		nExpanding := 0;
+		nExpanding := 0
 		for index := 0; index < boxes.Len(); index ++ {
 			if expands(index) {
 				nExpanding ++

scrollbar.go

@@ -141,6 +141,8 @@ func (this *Scrollbar) handleKeyUp (key input.Key, numpad bool) bool {
 	switch key {
 	case input.KeyUp,   input.KeyLeft:  return true
 	case input.KeyDown, input.KeyRight: return true
+	case input.KeyPageUp:   return true
+	case input.KeyPageDown: return true
 	case input.KeyHome:     return true
 	case input.KeyEnd:      return true
 	}
@@ -148,12 +150,6 @@ func (this *Scrollbar) handleKeyUp (key input.Key, numpad bool) bool {
 }
 
 func (this *Scrollbar) handleKeyDown (key input.Key, numpad bool) bool {
-	var increment float64; if this.layout.vertical {
-		increment = -0.05
-	} else {
-		increment = 0.05
-	}
-
 	modifiers := this.Window().Modifiers()
 
 	switch key {
@@ -161,15 +157,20 @@ func (this *Scrollbar) handleKeyDown (key input.Key, numpad bool) bool {
 		if modifiers.Alt {
 			this.SetValue(0)
 		} else {
-			this.SetValue(this.Value() - increment)
+			this.scrollBy(this.StepSize())
 		}
 		return true
 	case input.KeyDown, input.KeyRight:
 		if modifiers.Alt {
 			this.SetValue(1)
 		} else {
-			this.SetValue(this.Value() + increment)
+			this.scrollBy(-this.StepSize())
 		}
+	case input.KeyPageUp:
+		this.scrollBy(this.PageSize())
+		return true
+	case input.KeyPageDown:
+		this.scrollBy(-this.PageSize())
 		return true
 	case input.KeyHome:
 		this.SetValue(0)
@@ -229,11 +230,22 @@ func (this *Scrollbar) handleButtonUp (button input.Button) bool {
 
 func (this *Scrollbar) handleMouseMove () bool {
 	if !this.dragging { return false }
+	this.drag()
 	return true
 }
 
 func (this *Scrollbar) handleScroll (x, y float64) bool {
 	if this.layout.linked == nil { return false }
+	
+	delta := (x + y)
+	if this.layout.vertical {
+		x = 0
+		y = delta
+	} else {
+		x = delta
+		y = 0
+	}
+	
 	this.layout.linked.ScrollTo (
 		this.layout.linked.ContentBounds().Min.
 		Sub(image.Pt(int(x), int(y))))

scrollcontainer.go

@@ -73,7 +73,11 @@ func NewScrollContainer (sides ScrollSide) *ScrollContainer {
 	this.OnKeyUp(this.handleKeyUp)
 	this.SetRole(tomo.R("objects", "ScrollContainer"))
 	this.SetTag(sides.String(), true)
+	if sides == ScrollHorizontal {
+		this.SetAttr(tomo.ALayout(layouts.NewGrid(true)(true, false)))
+	} else {
 		this.SetAttr(tomo.ALayout(layouts.NewGrid(true, false)(true, false)))
+	}
 	return this
 }
 
@@ -196,6 +200,7 @@ func (this *ScrollContainer) handleKeyDown (key input.Key, numpad bool) bool {
 		} else {
 			vector.Y -= this.PageSize().Y
 		}
+		this.scrollBy(vector)
 		return true
 	case input.KeyPageDown:
 		if modifiers.Shift {
@@ -203,6 +208,23 @@ func (this *ScrollContainer) handleKeyDown (key input.Key, numpad bool) bool {
 		} else {
 			vector.Y += this.PageSize().Y
 		}
+		this.scrollBy(vector)
+		return true
+	case input.KeyUp:
+		if modifiers.Shift {
+			vector.X -= this.StepSize().X
+		} else {
+			vector.Y -= this.StepSize().Y
+		}
+		this.scrollBy(vector)
+		return true
+	case input.KeyDown:
+		if modifiers.Shift {
+			vector.X += this.StepSize().X
+		} else {
+			vector.Y += this.StepSize().Y
+		}
+		this.scrollBy(vector)
 		return true
 	}
 	return false

textinput.go

@@ -66,60 +66,61 @@ func (this *TextInput) handleKeyDown (key input.Key, numpad bool) bool {
 	dot       := this.Dot()
 	modifiers := this.Window().Modifiers()
 	word      := modifiers.Control
-	sel       := modifiers.Shift
 	changed   := false
 
-	// TODO all dot control (movement, selection, etc) should be done in the
+	defer func () {
-	// backend. (editing should be done here, though)
-
-	switch {
-	case key == input.KeyEnter:
-		this.on.confirm.Broadcast()
-	case key == input.KeyHome || (modifiers.Alt && key == input.KeyLeft):
-		dot.End = 0
-		if !sel { dot.Start = dot.End }
-	case key == input.KeyEnd || (modifiers.Alt && key == input.KeyRight):
-		dot.End = len(this.text)
-		if !sel { dot.Start = dot.End }
-	case key == input.KeyLeft:
-		if sel {
-			dot = text.SelectLeft(this.text, dot, word)
-		} else {
-			dot = text.MoveLeft(this.text, dot, word)
-		}
-	case key == input.KeyRight:
-		if sel {
-			dot = text.SelectRight(this.text, dot, word)
-		} else {
-			dot = text.MoveRight(this.text, dot, word)
-		}
-	case key == input.KeyBackspace:
-		this.text, dot = text.Backspace(this.text, dot, word)
-		changed = true
-	case key == input.KeyDelete:
-		this.text, dot = text.Delete(this.text, dot, word)
-		changed = true
-	case key == input.Key('a') && modifiers.Control:
-		dot.Start = 0
-		dot.End   = len(this.text)
-	case key.Printable():
-		this.text, dot = text.Type(this.text, dot, rune(key))
-		changed = true
-	}
-
 		this.Select(dot)
 		if changed {
 			this.SetText(string(this.text))
 			this.on.valueChange.Broadcast()
 		}
+	} ()
+
+	switch {
+	case key == input.KeyEnter:
+		this.on.confirm.Broadcast()
 		return true
+	case key == input.KeyBackspace:
+		this.text, dot = text.Backspace(this.text, dot, word)
+		changed = true
+		return true
+	case key == input.KeyDelete:
+		this.text, dot = text.Delete(this.text, dot, word)
+		changed = true
+		return true
+	case key == input.Key('a') && modifiers.Control:
+		dot.Start = 0
+		dot.End   = len(this.text)
+		return true
+	case key.Printable():
+		this.text, dot = text.Type(this.text, dot, rune(key))
+		changed = true
+		return true
+	default:
+		return false
+	}
 }
 
 func (this *TextInput) handleKeyUp (key input.Key, numpad bool) bool {
+	modifiers := this.Window().Modifiers()
+	switch {
+	case key == input.KeyEnter:
 		return true
+	case key == input.KeyBackspace:
+		return true
+	case key == input.KeyDelete:
+		return true
+	case key == input.Key('a') && modifiers.Control:
+		return true
+	case key.Printable():
+		return true
+	default:
+		return false
+	}
 }
 
 func (this *TextInput) handleScroll (x, y float64) bool {
-	this.ScrollTo(this.ContentBounds().Min.Add(image.Pt(int(x), int(y))))
+	if x == 0 { return false }
+	this.ScrollTo(this.ContentBounds().Min.Sub(image.Pt(int(x), int(y))))
 	return true
 }

textview.go

@@ -22,6 +22,6 @@ func NewTextView (text string) *TextView {
 }
 
 func (this *TextView) handleScroll (x, y float64) bool {
-	this.ScrollTo(this.ContentBounds().Min.Add(image.Pt(int(x), int(y))))
+	this.ScrollTo(this.ContentBounds().Min.Sub(image.Pt(int(x), int(y))))
 	return true
 }