tomo/tomo-old
Archived
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Redid the entity system a bit to make it more reliable

Browse Source 
Now it supports things like parenting elements before they are
added to a window and elements no longer have to constantly check
for a nil entity
This commit is contained in:
sashakoshka
2023-04-15 01:14:36 -04:00
parent 5cf0b162c0
commit 437aef0c27
12 changed files with 129 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
elements/button.go
+9 -18
View File
@@ -30,6 +30,7 @@ type Button struct {
// NewButton creates a new button with the specified label text.
func NewButton (text string) (element *Button) {
element = &Button { showText: true, enabled: true }
element.entity = tomo.NewEntity(element).(tomo.FocusableEntity)
element.theme.Case = tomo.C("tomo", "button")
element.drawer.SetFace (element.theme.FontFace (
tomo.FontStyleRegular,
@@ -38,11 +39,9 @@ func NewButton (text string) (element *Button) {
return
}
// Bind binds this element to an entity.
func (element *Button) Bind (entity tomo.Entity) {
if entity == nil { element.entity = nil; return }
element.entity = entity.(tomo.FocusableEntity)
element.updateMinimumSize()
// Entity returns this element's entity.
func (element *Button) Entity () tomo.Entity {
return element.entity
}
// OnClick sets the function to be called when the button is clicked.
@@ -52,7 +51,6 @@ func (element *Button) OnClick (callback func ()) {
// Focus gives this element input focus.
func (element *Button) Focus () {
if element.entity == nil { return }
if !element.entity.Focused() { element.entity.Focus() }
}
@@ -65,7 +63,6 @@ func (element *Button) Enabled () bool {
func (element *Button) SetEnabled (enabled bool) {
if element.enabled == enabled { return }
element.enabled = enabled
if element.entity == nil { return }
element.entity.Invalidate()
}
@@ -74,7 +71,6 @@ func (element *Button) SetText (text string) {
if element.text == text { return }
element.text = text
element.drawer.SetText([]rune(text))
if element.entity == nil { return }
element.updateMinimumSize()
element.entity.Invalidate()
}
@@ -97,7 +93,6 @@ func (element *Button) SetIcon (id tomo.Icon) {
func (element *Button) ShowText (showText bool) {
if element.showText == showText { return }
element.showText = showText
if element.entity == nil { return }
element.updateMinimumSize()
element.entity.Invalidate()
}
@@ -109,7 +104,6 @@ func (element *Button) SetTheme (new tomo.Theme) {
element.drawer.SetFace (element.theme.FontFace (
tomo.FontStyleRegular,
tomo.FontSizeNormal))
if element.entity == nil { return }
element.updateMinimumSize()
element.entity.Invalidate()
}
@@ -118,14 +112,12 @@ func (element *Button) SetTheme (new tomo.Theme) {
func (element *Button) SetConfig (new tomo.Config) {
if new == element.config.Config { return }
element.config.Config = new
if element.entity == nil { return }
element.updateMinimumSize()
element.entity.Invalidate()
}
// Draw causes the element to draw to the specified destination canvas.
func (element *Button) Draw (destination canvas.Canvas) {
if element.entity == nil { return }
state := element.state()
bounds := element.entity.Bounds()
pattern := element.theme.Pattern(tomo.PatternButton, state)
@@ -182,7 +174,7 @@ func (element *Button) Draw (destination canvas.Canvas) {
}
func (element *Button) HandleFocusChange () {
if element.entity != nil { element.entity.Invalidate() }
element.entity.Invalidate()
}
func (element *Button) HandleMouseDown (x, y int, button input.Button) {
@@ -190,32 +182,31 @@ func (element *Button) HandleMouseDown (x, y int, button input.Button) {
element.Focus()
if button != input.ButtonLeft { return }
element.pressed = true
if element.entity != nil { element.entity.Invalidate() }
element.entity.Invalidate()
}
func (element *Button) HandleMouseUp (x, y int, button input.Button) {
if element.entity == nil { return }
if button != input.ButtonLeft { return }
element.pressed = false
within := image.Point { x, y }.In(element.entity.Bounds())
if element.Enabled() && within && element.onClick != nil {
element.onClick()
}
if element.entity != nil { element.entity.Invalidate() }
element.entity.Invalidate()
}
func (element *Button) HandleKeyDown (key input.Key, modifiers input.Modifiers) {
if !element.Enabled() { return }
if key == input.KeyEnter {
element.pressed = true
if element.entity != nil { element.entity.Invalidate() }
element.entity.Invalidate()
}
}
func (element *Button) HandleKeyUp(key input.Key, modifiers input.Modifiers) {
if key == input.KeyEnter && element.pressed {
element.pressed = false
if element.entity != nil { element.entity.Invalidate() }
element.entity.Invalidate()
if !element.Enabled() { return }
if element.onClick != nil {
element.onClick()
elements/checkbox.go
+5 -15
View File
@@ -27,6 +27,7 @@ type Checkbox struct {
// NewCheckbox creates a new cbeckbox with the specified label text.
func NewCheckbox (text string, checked bool) (element *Checkbox) {
element = &Checkbox { checked: checked, enabled: true }
element.entity = tomo.NewEntity(element).(tomo.FocusableEntity)
element.theme.Case = tomo.C("tomo", "checkbox")
element.drawer.SetFace (element.theme.FontFace (
tomo.FontStyleRegular,
@@ -35,11 +36,9 @@ func NewCheckbox (text string, checked bool) (element *Checkbox) {
return
}
// Bind binds this element to an entity.
func (element *Checkbox) Bind (entity tomo.Entity) {
if entity == nil { element.entity = nil; return }
element.entity = entity.(tomo.FocusableEntity)
element.updateMinimumSize()
// Entity returns this element's entity.
func (element *Checkbox) Entity () tomo.Entity {
return element.entity
}
// OnToggle sets the function to be called when the checkbox is toggled.
@@ -54,7 +53,6 @@ func (element *Checkbox) Value () (checked bool) {
// Focus gives this element input focus.
func (element *Checkbox) Focus () {
if element.entity == nil { return }
if !element.entity.Focused() { element.entity.Focus() }
}
@@ -76,7 +74,6 @@ func (element *Checkbox) SetText (text string) {
if element.text == text { return }
element.text = text
element.drawer.SetText([]rune(text))
if element.entity == nil { return }
element.updateMinimumSize()
element.entity.Invalidate()
}
@@ -88,7 +85,6 @@ func (element *Checkbox) SetTheme (new tomo.Theme) {
element.drawer.SetFace (element.theme.FontFace (
tomo.FontStyleRegular,
tomo.FontSizeNormal))
if element.entity == nil { return }
element.updateMinimumSize()
element.entity.Invalidate()
}
@@ -97,15 +93,12 @@ func (element *Checkbox) SetTheme (new tomo.Theme) {
func (element *Checkbox) SetConfig (new tomo.Config) {
if new == element.config.Config { return }
element.config.Config = new
if element.entity == nil { return }
element.updateMinimumSize()
element.entity.Invalidate()
}
// Draw causes the element to draw to the specified destination canvas.
func (element *Checkbox) Draw (destination canvas.Canvas) {
if element.entity == nil { return }
bounds := element.entity.Bounds()
boxBounds := image.Rect(0, 0, bounds.Dy(), bounds.Dy()).Add(bounds.Min)
@@ -116,7 +109,7 @@ func (element *Checkbox) Draw (destination canvas.Canvas) {
On: element.checked,
}
element.entity.DrawBackground(destination, bounds)
element.entity.DrawBackground(destination)
pattern := element.theme.Pattern(tomo.PatternButton, state)
pattern.Draw(destination, boxBounds)
@@ -135,7 +128,6 @@ func (element *Checkbox) Draw (destination canvas.Canvas) {
}
func (element *Checkbox) HandleMouseDown (x, y int, button input.Button) {
if element.entity == nil { return }
if !element.Enabled() { return }
element.Focus()
element.pressed = true
@@ -143,7 +135,6 @@ func (element *Checkbox) HandleMouseDown (x, y int, button input.Button) {
}
func (element *Checkbox) HandleMouseUp (x, y int, button input.Button) {
if element.entity == nil { return }
if button != input.ButtonLeft || !element.pressed { return }
element.pressed = false
@@ -167,7 +158,6 @@ func (element *Checkbox) HandleKeyDown (key input.Key, modifiers input.Modifiers
}
func (element *Checkbox) HandleKeyUp (key input.Key, modifiers input.Modifiers) {
if element.entity == nil { return }
if key == input.KeyEnter && element.pressed {
element.pressed = false
element.checked = !element.checked
elements/icon.go
+5 -5
View File
@@ -20,15 +20,15 @@ func NewIcon (id tomo.Icon, size tomo.IconSize) (element *Icon) {
id: id,
size: size,
}
element.entity = tomo.NewEntity(element)
element.theme.Case = tomo.C("tomo", "icon")
element.updateMinimumSize()
return
}
// Bind binds this element to an entity.
func (element *Icon) Bind (entity tomo.Entity) {
if entity == nil { element.entity = nil; return }
element.entity = entity
element.updateMinimumSize()
// Entity returns this element's entity.
func (element *Icon) Entity () tomo.Entity {
return element.entity
}
// SetIcon sets the element's icon.
elements/image.go
+6 -6
View File
@@ -16,15 +16,15 @@ type Image struct {
// NewImage creates a new image element.
func NewImage (image image.Image) (element *Image) {
element = &Image { buffer: canvas.FromImage(image) }
element.entity = tomo.NewEntity(element)
bounds := element.buffer.Bounds()
element.entity.SetMinimumSize(bounds.Dx(), bounds.Dy())
return
}
// Bind binds this element to an entity.
func (element *Image) Bind (entity tomo.Entity) {
if entity == nil { element.entity = nil; return }
element.entity = entity
bounds := element.buffer.Bounds()
element.entity.SetMinimumSize(bounds.Dx(), bounds.Dy())
// Entity returns this element's entity.
func (element *Image) Entity () tomo.Entity {
return element.entity
}
// Draw causes the element to draw to the specified destination canvas.
elements/label.go
+6 -7
View File
@@ -29,6 +29,7 @@ type Label struct {
func NewLabel (text string, wrap bool) (element *Label) {
element = &Label { }
element.theme.Case = tomo.C("tomo", "label")
element.entity = tomo.NewEntity(element).(tomo.FlexibleEntity)
element.drawer.SetFace (element.theme.FontFace (
tomo.FontStyleRegular,
tomo.FontSizeNormal))
@@ -37,11 +38,9 @@ func NewLabel (text string, wrap bool) (element *Label) {
return
}
// Bind binds this element to an entity.
func (element *Label) Bind (entity tomo.Entity) {
if entity == nil { element.entity = nil; return }
element.entity = entity.(tomo.FlexibleEntity)
element.updateMinimumSize()
// Entity returns this element's entity.
func (element *Label) Entity () tomo.Entity {
return element.entity
}
// EmCollapse forces a minimum width and height upon the label. The width is
@@ -128,14 +127,14 @@ func (element *Label) SetConfig (new tomo.Config) {
func (element *Label) Draw (destination canvas.Canvas) {
if element.entity == nil { return }
bounds := element.entity. Bounds()
bounds := element.entity.Bounds()
if element.wrap {
element.drawer.SetMaxWidth(bounds.Dx())
element.drawer.SetMaxHeight(bounds.Dy())
}
element.entity.DrawBackground(destination, bounds)
element.entity.DrawBackground(destination)
textBounds := element.drawer.LayoutBounds()
foreground := element.theme.Color (