Update code for objects

button.go

@@ -29,7 +29,6 @@ func NewButton (text string) *Button {
 		label:        NewLabel(text),
 	}
 	box.SetRole(tomo.R("objects", "Button", ""))
-	tomo.Apply(box)
 	box.label.SetAlign(tomo.AlignMiddle, tomo.AlignMiddle)
 	box.SetLayout(buttonLayout)
 	box.SetText(text)

checkbox.go

@@ -19,7 +19,6 @@ func NewCheckbox (value bool) *Checkbox {
 		Box: tomo.NewBox(),
 	}
 	box.SetRole(tomo.R("objects", "Checkbox", ""))
-	tomo.Apply(box)
 	box.SetValue(false)
 	
 	box.OnMouseUp(box.handleMouseUp)

go.mod

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

go.sum

@@ -1,5 +1,5 @@
-git.tebibyte.media/tomo/tomo v0.36.0 h1:V9vyPYb4kpUceBhcDF/XyLDACzE5lY8kYEGHAkIsqs0=
+git.tebibyte.media/tomo/tomo v0.38.0 h1:K5TP67RxnszudeNfmGZiU5cFTRjFueXiI3NCsgw+05U=
-git.tebibyte.media/tomo/tomo v0.36.0/go.mod h1:C9EzepS9wjkTJjnZaPBh22YvVPyA4hbBAJVU20Rdmps=
+git.tebibyte.media/tomo/tomo v0.38.0/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

@@ -16,7 +16,6 @@ func NewHeading (level int, text string) *Heading {
 	if level > 2 { level = 2 }
 	this := &Heading { TextBox: tomo.NewTextBox() }
 	this.SetRole(tomo.R("objects", "Heading", fmt.Sprint(level)))
-	tomo.Apply(this)
 	this.SetText(text)
 	return this
 }

icon.go

@@ -16,7 +16,6 @@ func NewIcon (id tomo.Icon, size tomo.IconSize) *Icon {
 		Box: tomo.NewBox(),
 	}
 	this.SetRole(tomo.R("objects", "Icon", size.String()))
-	tomo.Apply(this)
 	this.SetTexture(id.Texture(size))
 	return this
 }
@@ -27,7 +26,6 @@ func NewMimeIcon (mime data.Mime, size tomo.IconSize) *Icon {
 		Box: tomo.NewBox(),
 	}
 	this.SetRole(tomo.R("objects", "Icon", size.String()))
-	tomo.Apply(this)
 	this.SetTexture(tomo.MimeIcon(mime, size))
 	return this
 }

label.go

@@ -11,7 +11,6 @@ type Label struct {
 func NewLabel (text string) *Label {
 	this := &Label { TextBox: tomo.NewTextBox() }
 	this.SetRole(tomo.R("objects", "Label", ""))
-	tomo.Apply(this)
 	this.SetText(text)
 	return this
 }

labelcheckbox.go

@@ -21,7 +21,6 @@ func NewLabelCheckbox (value bool, text string) *LabelCheckbox {
 		label:        NewLabel(text),
 	}
 	box.SetRole(tomo.R("objects", "LabelCheckbox", ""))
-	tomo.Apply(box)
 	box.label.SetAlign(tomo.AlignStart, tomo.AlignMiddle)
 	box.Add(box.checkbox)
 	box.Add(box.label)

menu.go

@@ -41,7 +41,6 @@ func NewMenu (anchor tomo.Object, items ...tomo.Object) (*Menu, error) {
 	if !menu.torn {
 		menu.tearLine = tomo.NewBox()
 		menu.tearLine.SetRole(tomo.R("objects", "TearLine", ""))
-		tomo.Apply(menu.tearLine)
 		menu.tearLine.SetFocusable(true)
 		menu.tearLine.OnKeyUp(func (key input.Key, numberPad bool) {
 			if key != input.KeyEnter && key != input.Key(' ') { return }
@@ -67,7 +66,6 @@ func NewMenu (anchor tomo.Object, items ...tomo.Object) (*Menu, error) {
 		}
 	}
 	menu.rootContainer.SetRole(tomo.R("objects", "Container", "menu"))
-	tomo.Apply(menu.rootContainer)
 
 	menu.Window.SetRoot(menu.rootContainer)
 	return menu, nil

menuitem.go

@@ -26,7 +26,6 @@ func NewMenuItem (text string) *MenuItem {
 		icon:         NewIcon("", tomo.IconSizeSmall),
 	}
 	box.SetRole(tomo.R("objects", "MenuItem", ""))
-	tomo.Apply(box)
 	box.label.SetAlign(tomo.AlignStart, tomo.AlignMiddle)
 	box.SetLayout(layouts.NewGrid([]bool { false, true }, []bool { true }))
 	

numberinput.go

@@ -29,7 +29,6 @@ func NewNumberInput (value float64) *NumberInput {
 		decrement:    NewButton(""),
 	}
 	box.SetRole(tomo.R("objects", "NumberInput", ""))
-	tomo.Apply(box)
 	box.Add(box.input)
 	box.Add(box.decrement)
 	box.Add(box.increment)

scrollbar.go

@@ -47,9 +47,7 @@ func newScrollbar (orient string) *Scrollbar {
 	this.OnScroll(this.handleScroll)
 	
 	this.handle.SetRole(tomo.R("objects", "SliderHandle", orient))
-	tomo.Apply(this.handle)
 	this.SetRole(tomo.R("objects", "Slider", orient))
-	tomo.Apply(this)
 	return this
 }
 

scrollcontainer.go

@@ -61,7 +61,6 @@ func NewScrollContainer (sides ScrollSide) *ScrollContainer {
 	this.CaptureScroll(true)
 	this.OnScroll(this.handleScroll)
 	this.SetRole(tomo.R("objects", "ScrollContainer", sides.String()))
-	tomo.Apply(this)
 	this.SetLayout(this.layout)
 	return this
 }

separator.go

@@ -13,6 +13,5 @@ func NewSeparator () *Separator {
 		Box: tomo.NewBox(),
 	}
 	this.SetRole(tomo.R("objects", "Separator", ""))
-	tomo.Apply(this)
 	return this
 }

slider.go

@@ -53,9 +53,7 @@ func newSlider (orient string, value float64) *Slider {
 	this.OnScroll(this.handleScroll)
 	
 	this.handle.SetRole(tomo.R("objects", "SliderHandle", orient))
-	tomo.Apply(this.handle)
 	this.SetRole(tomo.R("objects", "Slider", orient))
-	tomo.Apply(this)
 	return this
 }
 

textinput.go

@@ -20,7 +20,6 @@ type TextInput struct {
 func NewTextInput (text string) *TextInput {
 	this := &TextInput { TextBox: tomo.NewTextBox() }
 	this.SetRole(tomo.R("objects", "TextInput", ""))
-	tomo.Apply(this)
 	this.SetAlign(tomo.AlignStart, tomo.AlignMiddle)
 	this.SetText(text)
 	this.SetFocusable(true)

textview.go

@@ -12,7 +12,6 @@ type TextView struct {
 func NewTextView (text string) *TextView {
 	this := &TextView { TextBox: tomo.NewTextBox() }
 	this.SetRole(tomo.R("objects", "TextView", ""))
-	tomo.Apply(this)
 	this.SetFocusable(true)
 	this.SetSelectable(true)
 	this.SetText(text)