Dropdown no longer embeds tomo.ContainerBox

Progress on #7

button.go

@@ -5,13 +5,15 @@ import "git.tebibyte.media/tomo/tomo/input"
 import "git.tebibyte.media/tomo/tomo/event"
 import "git.tebibyte.media/tomo/objects/layouts"
 
+var _ tomo.Object = new(Button)
+
 var buttonLayout     = layouts.Row { true        }
 var iconButtonLayout = layouts.Row { true        }
 var bothButtonLayout = layouts.Row { false, true }
 
 // Button is a clickable button.
 type Button struct {
-	tomo.ContainerBox
+	box tomo.ContainerBox
 
 	label *Label
 	icon  *Icon
@@ -24,33 +26,45 @@ type Button struct {
 
 // NewButton creates a new button with the specified text.
 func NewButton (text string) *Button {
-	box := &Button {
+	button := &Button {
-		ContainerBox: tomo.NewContainerBox(),
+		box:   tomo.NewContainerBox(),
-		label:        NewLabel(text),
+		label: NewLabel(text),
 	}
-	box.SetRole(tomo.R("objects", "Button"))
+	button.box.SetRole(tomo.R("objects", "Button"))
-	box.label.SetAttr(tomo.AAlign(tomo.AlignMiddle, tomo.AlignMiddle))
+	button.label.SetAttr(tomo.AAlign(tomo.AlignMiddle, tomo.AlignMiddle))
-	box.SetAttr(tomo.ALayout(buttonLayout))
+	button.box.SetAttr(tomo.ALayout(buttonLayout))
-	box.SetText(text)
+	button.SetText(text)
 	
-	box.SetInputMask(true)
+	button.box.SetInputMask(true)
-	box.OnButtonDown(box.handleButtonDown)
+	button.box.OnButtonDown(button.handleButtonDown)
-	box.OnButtonUp(box.handleButtonUp)
+	button.box.OnButtonUp(button.handleButtonUp)
-	box.OnKeyDown(box.handleKeyDown)
+	button.box.OnKeyDown(button.handleKeyDown)
-	box.OnKeyUp(box.handleKeyUp)
+	button.box.OnKeyUp(button.handleKeyUp)
-	box.SetFocusable(true)
+	button.box.SetFocusable(true)
-	return box
+	return button
+}
+
+// GetBox returns the underlying box.
+func (this *Button) GetBox () tomo.Box {
+	return this.box
+}
+
+// SetFocused sets whether or not this button has keyboard focus. If set to
+// true, this method will steal focus away from whichever object currently has
+// focus.
+func (this *Button) SetFocused (focused bool) {
+	this.box.SetFocused(focused)
 }
 
 // SetText sets the text of the button's label.
 func (this *Button) SetText (text string) {
 	this.label.SetText(text)
 	if this.labelActive && text == "" {
-		this.Remove(this.label)
+		this.box.Remove(this.label)
 		this.labelActive = false
 	}
 	if !this.labelActive && text != "" {
-		this.Add(this.label)
+		this.box.Add(this.label)
 		this.labelActive = true
 	}
 	this.applyLayout()
@@ -59,7 +73,7 @@ func (this *Button) SetText (text string) {
 // SetIcon sets an icon for this button. Setting the icon to IconUnknown will
 // remove it.
 func (this *Button) SetIcon (id tomo.Icon) {
-	if this.icon != nil { this.Remove(this.icon) }
+	if this.icon != nil { this.box.Remove(this.icon) }
 
 	var icon *Icon; if id != tomo.IconUnknown {
 		icon = NewIcon(id, tomo.IconSizeSmall)
@@ -67,9 +81,9 @@ func (this *Button) SetIcon (id tomo.Icon) {
 	this.icon = icon
 
 	if this.icon != nil {
-		this.Insert(this.icon, this.label)
+		this.box.Insert(this.icon, this.label)
 	}
-	this.SetTag("icon", this.icon != nil)
+	this.box.SetTag("icon", this.icon != nil)
 	this.applyLayout()
 }
 
@@ -80,33 +94,33 @@ func (this *Button) OnClick (callback func ()) event.Cookie {
 
 func (this *Button) applyLayout () {
 	if this.labelActive && this.icon == nil {
-		this.SetAttr(tomo.ALayout(buttonLayout))
+		this.box.SetAttr(tomo.ALayout(buttonLayout))
 	} else if !this.labelActive && this.icon != nil {
-		this.SetAttr(tomo.ALayout(iconButtonLayout))
+		this.box.SetAttr(tomo.ALayout(iconButtonLayout))
 	} else {
-		this.SetAttr(tomo.ALayout(bothButtonLayout))
+		this.box.SetAttr(tomo.ALayout(bothButtonLayout))
 	}
 }
 
 func (this *Button) handleKeyDown (key input.Key, numberPad bool) bool {
-	if key != input.KeyEnter && key != input.Key(' ') { return false }
+	if !isClickingKey(key) { return false }
-	return true
-}
-
-func (this *Button) handleKeyUp (key input.Key, numberPad bool) bool {
-	if key != input.KeyEnter && key != input.Key(' ') { return false }
 	this.on.click.Broadcast()
 	return true
 }
 
+func (this *Button) handleKeyUp (key input.Key, numberPad bool) bool {
+	if !isClickingKey(key) { return false }
+	return true
+}
+
 func (this *Button) handleButtonDown (button input.Button) bool {
-	if button != input.ButtonLeft { return false }
+	if !isClickingButton(button) { return false }
 	return true
 }
 
 func (this *Button) handleButtonUp (button input.Button) bool {
-	if button != input.ButtonLeft { return false }
+	if !isClickingButton(button) { return false }
-	if this.Window().MousePosition().In(this.Bounds()) {
+	if this.box.Window().MousePosition().In(this.box.Bounds()) {
 		this.on.click.Broadcast()
 	}
 	return true

calendar.go

@@ -6,10 +6,12 @@ import "git.tebibyte.media/tomo/tomo"
 import "git.tebibyte.media/tomo/tomo/event"
 import "git.tebibyte.media/tomo/objects/layouts"
 
+var _ tomo.Object = new(Calendar)
+
 // Calendar is an object that can display a date and allow the user to change
 // it. It can display one month at a time.
 type Calendar struct {
-	tomo.ContainerBox
+	box tomo.ContainerBox
 	
 	grid tomo.ContainerBox
 	time time.Time
@@ -23,11 +25,11 @@ type Calendar struct {
 // NewCalendar creates a new calendar with the specified date.
 func NewCalendar (tm time.Time) *Calendar {
 	calendar := &Calendar {
-		ContainerBox: tomo.NewContainerBox(),
+		box:  tomo.NewContainerBox(),
-		time:         tm,
+		time: tm,
 	}
-	calendar.SetRole(tomo.R("objects", "Calendar"))
+	calendar.box.SetRole(tomo.R("objects", "Calendar"))
-	calendar.SetAttr(tomo.ALayout(layouts.ContractVertical))
+	calendar.box.SetAttr(tomo.ALayout(layouts.ContractVertical))
 	
 	prevButton := NewButton("")
 	prevButton.SetIcon(tomo.IconGoPrevious)
@@ -48,17 +50,22 @@ func NewCalendar (tm time.Time) *Calendar {
 	calendar.grid.SetRole(tomo.R("objects", "CalendarGrid"))
 	calendar.grid.SetAttr(tomo.ALayout(layouts.NewGrid (
 		true, true, true, true, true, true, true)()))
-	calendar.Add(NewInnerContainer (
+	calendar.box.Add(NewInnerContainer (
 		layouts.Row { false, true, false },
 		prevButton, calendar.monthLabel, nextButton))
-	calendar.Add(calendar.grid)
+	calendar.box.Add(calendar.grid)
 	
-	calendar.OnScroll(calendar.handleScroll)
+	calendar.box.OnScroll(calendar.handleScroll)
 	
 	calendar.refresh()
 	return calendar
 }
 
+// GetBox returns the underlying box.
+func (this *Calendar) GetBox () tomo.Box {
+	return this.box
+}
+
 // Value returns the time this calendar is displaying.
 func (this *Calendar) Value () time.Time {
 	return this.time

checkbox.go

@@ -4,9 +4,11 @@ import "git.tebibyte.media/tomo/tomo"
 import "git.tebibyte.media/tomo/tomo/input"
 import "git.tebibyte.media/tomo/tomo/event"
 
+var _ tomo.Object = new(Checkbox)
+
 // Checkbox is a control that can be toggled.
 type Checkbox struct {
-	tomo.Box
+	box tomo.Box
 	value bool
 	on struct {
 		valueChange event.FuncBroadcaster
@@ -15,18 +17,30 @@ type Checkbox struct {
 
 // NewCheckbox creates a new checkbox with the specified value.
 func NewCheckbox (value bool) *Checkbox {
-	box := &Checkbox {
+	checkbox := &Checkbox {
-		Box: tomo.NewBox(),
+		box: tomo.NewBox(),
 	}
-	box.SetRole(tomo.R("objects", "Checkbox"))
+	checkbox.box.SetRole(tomo.R("objects", "Checkbox"))
-	box.SetValue(value)
+	checkbox.SetValue(value)
 	
-	box.OnButtonDown(box.handleButtonDown)
+	checkbox.box.OnButtonDown(checkbox.handleButtonDown)
-	box.OnButtonUp(box.handleButtonUp)
+	checkbox.box.OnButtonUp(checkbox.handleButtonUp)
-	box.OnKeyDown(box.handleKeyDown)
+	checkbox.box.OnKeyDown(checkbox.handleKeyDown)
-	box.OnKeyUp(box.handleKeyUp)
+	checkbox.box.OnKeyUp(checkbox.handleKeyUp)
-	box.SetFocusable(true)
+	checkbox.box.SetFocusable(true)
-	return box
+	return checkbox
+}
+
+// GetBox returns the underlying box.
+func (this *Checkbox) GetBox () tomo.Box {
+	return this.box
+}
+
+// SetFocused sets whether or not this checkbox has keyboard focus. If set to
+// true, this method will steal focus away from whichever object currently has
+// focus.
+func (this *Checkbox) SetFocused (focused bool) {
+	this.box.SetFocused(focused)
 }
 
 // Value returns the value of the checkbox.
@@ -38,8 +52,8 @@ func (this *Checkbox) Value () bool {
 func (this *Checkbox) SetValue (value bool) {
 	this.value = value
 	// the theme shall decide what checked and unchecked states look like
-	this.SetTag("checked",    value)
+	this.box.SetTag("checked",    value)
-	this.SetTag("unchecked", !value)
+	this.box.SetTag("unchecked", !value)
 }
 
 // Toggle toggles the value of the checkbox between true and false.
@@ -54,24 +68,24 @@ func (this *Checkbox) OnValueChange (callback func ()) event.Cookie {
 }
 
 func (this *Checkbox) handleKeyDown (key input.Key, numberPad bool) bool {
-	if key != input.KeyEnter && key != input.Key(' ') { return false }
+	if !isClickingKey(key) { return false }
 	this.Toggle()
 	return true
 }
 
 func (this *Checkbox) handleKeyUp (key input.Key, numberPad bool) bool {
-	if key != input.KeyEnter && key != input.Key(' ') { return false}
+	if !isClickingKey(key) { return false}
 	return true
 }
 
 func (this *Checkbox) handleButtonDown (button input.Button) bool {
-	if button != input.ButtonLeft { return false }
+	if !isClickingButton(button) { return false }
 	return true
 }
 
 func (this *Checkbox) handleButtonUp (button input.Button) bool {
-	if button != input.ButtonLeft { return false }
+	if !isClickingButton(button) { return false }
-	if this.Window().MousePosition().In(this.Bounds()) {
+	if this.box.Window().MousePosition().In(this.box.Bounds()) {
 		this.Toggle()
 	}
 	return true

colorpicker.go

@@ -8,13 +8,15 @@ import "git.tebibyte.media/tomo/tomo/canvas"
 import "git.tebibyte.media/tomo/objects/layouts"
 import "git.tebibyte.media/tomo/objects/internal"
 
-// ColorPicker allows the user to pick a color by controlling its HSBA
+var _ tomo.Object = new(HSVAColorPicker)
+
+// HSVAColorPicker allows the user to pick a color by controlling its HSVA
 // parameters.
-type ColorPicker struct {
+type HSVAColorPicker struct {
-	tomo.ContainerBox
+	box tomo.ContainerBox
 	value internal.HSVA
 	
-	pickerMap   *colorPickerMap
+	pickerMap   *hsvaColorPickerMap
 	hueSlider   *Slider
 	alphaSlider *Slider
 	
@@ -23,18 +25,18 @@ type ColorPicker struct {
 	}
 }
 
-// NewColorPicker creates a new color picker with the specified color.
+// NewHSVAColorPicker creates a new color picker with the specified color.
-func NewColorPicker (value color.Color) *ColorPicker {
+func NewHSVAColorPicker (value color.Color) *HSVAColorPicker {
-	picker := &ColorPicker {
+	picker := &HSVAColorPicker {
-		ContainerBox: tomo.NewContainerBox(),
+		box: tomo.NewContainerBox(),
 	}
-	picker.SetRole(tomo.R("objects", "ColorPicker"))
+	picker.box.SetRole(tomo.R("objects", "ColorPicker"))
-	picker.SetAttr(tomo.ALayout(layouts.Row { true, false, false }))
+	picker.box.SetAttr(tomo.ALayout(layouts.Row { true, false, false }))
-	picker.pickerMap = newColorPickerMap(picker)
+	picker.pickerMap = newHsvaColorPickerMap(picker)
-	picker.Add(picker.pickerMap)
+	picker.box.Add(picker.pickerMap)
 	
 	picker.hueSlider = NewVerticalSlider(0.0)
-	picker.Add(picker.hueSlider)
+	picker.box.Add(picker.hueSlider)
 	picker.hueSlider.OnValueChange(func () {
 		picker.value.H = picker.hueSlider.Value()
 		picker.on.valueChange.Broadcast()
@@ -42,9 +44,9 @@ func NewColorPicker (value color.Color) *ColorPicker {
 	})
 	
 	picker.alphaSlider = NewVerticalSlider(0.0)
-	picker.Add(picker.alphaSlider)
+	picker.box.Add(picker.alphaSlider)
 	picker.alphaSlider.OnValueChange(func () {
-		picker.value.A = uint8(picker.alphaSlider.Value() * 255)
+		picker.value.A = uint16(picker.alphaSlider.Value() * 0xFFFF)
 		picker.on.valueChange.Broadcast()
 		picker.pickerMap.Invalidate()
 	})
@@ -54,38 +56,51 @@ func NewColorPicker (value color.Color) *ColorPicker {
 	return picker
 }
 
+// GetBox returns the underlying box.
+func (this *HSVAColorPicker) GetBox () tomo.Box {
+	return this.box
+}
+
+// SetFocused sets whether or not this color picker has keyboard focus. If set
+// to true, this method will steal focus away from whichever object currently
+// has focus.
+func (this *HSVAColorPicker) SetFocused (focused bool) {
+	this.box.SetFocused(focused)
+}
+
 // Value returns the color of the picker.
-func (this *ColorPicker) Value () color.Color {
+func (this *HSVAColorPicker) Value () color.Color {
 	return this.value
 }
 
 // SetValue sets the color of the picker.
-func (this *ColorPicker) SetValue (value color.Color) {
+func (this *HSVAColorPicker) SetValue (value color.Color) {
 	if value == nil { value = color.Transparent }
-	this.value = internal.RGBAToHSVA(value.RGBA())
+	this.value = internal.HSVAModel.Convert(value).(internal.HSVA)
 	this.hueSlider.SetValue(this.value.H)
-	this.alphaSlider.SetValue(float64(this.value.A) / 255)
+	this.alphaSlider.SetValue(float64(this.value.A) / 0xFFFF)
+	this.pickerMap.Invalidate()
 }
 
 // OnValueChange specifies a function to be called when the user changes the
 // swatch's color.
-func (this *ColorPicker) OnValueChange (callback func ()) event.Cookie {
+func (this *HSVAColorPicker) OnValueChange (callback func ()) event.Cookie {
 	return this.on.valueChange.Connect(callback)
 }
 
 // RGBA satisfies the color.Color interface
-func (this *ColorPicker) RGBA () (r, g, b, a uint32) {
+func (this *HSVAColorPicker) RGBA () (r, g, b, a uint32) {
 	return this.value.RGBA()
 }
 
-type colorPickerMap struct {
+type hsvaColorPickerMap struct {
 	tomo.CanvasBox
 	dragging bool
-	parent *ColorPicker
+	parent *HSVAColorPicker
 }
 
-func newColorPickerMap (parent *ColorPicker) *colorPickerMap {
+func newHsvaColorPickerMap (parent *HSVAColorPicker) *hsvaColorPickerMap {
-	picker := &colorPickerMap {
+	picker := &hsvaColorPickerMap {
 		CanvasBox: tomo.NewCanvasBox(),
 		parent: parent,
 	}
@@ -97,26 +112,26 @@ func newColorPickerMap (parent *ColorPicker) *colorPickerMap {
 	return picker
 }
 
-func (this *colorPickerMap) handleButtonDown (button input.Button) bool {
+func (this *hsvaColorPickerMap) handleButtonDown (button input.Button) bool {
 	if button != input.ButtonLeft { return false }
 	this.dragging = true
 	this.drag()
 	return true
 }
 
-func (this *colorPickerMap) handleButtonUp (button input.Button) bool {
+func (this *hsvaColorPickerMap) handleButtonUp (button input.Button) bool {
 	if button != input.ButtonLeft { return false }
 	this.dragging = false
 	return true
 }
 
-func (this *colorPickerMap) handleMouseMove () bool {
+func (this *hsvaColorPickerMap) handleMouseMove () bool {
 	if !this.dragging { return false }
 	this.drag()
 	return true
 }
 
-func (this *colorPickerMap) drag () {
+func (this *hsvaColorPickerMap) drag () {
 	pointer := this.Window().MousePosition()
 	bounds  := this.InnerBounds()
 	this.parent.value.S =     float64(pointer.X - bounds.Min.X) / float64(bounds.Dx())
@@ -126,7 +141,7 @@ func (this *colorPickerMap) drag () {
 	this.Invalidate()
 }
 
-func (this *colorPickerMap) Draw (can canvas.Canvas) {
+func (this *hsvaColorPickerMap) Draw (can canvas.Canvas) {
 	bounds := can.Bounds()
 	for y := bounds.Min.Y; y < bounds.Max.Y; y ++ {
 	for x := bounds.Min.X; x < bounds.Max.X; x ++ {
@@ -137,7 +152,7 @@ func (this *colorPickerMap) Draw (can canvas.Canvas) {
 			H: this.parent.value.H,
 			S:     float64(xx) / float64(bounds.Dx()),
 			V: 1 - float64(yy) / float64(bounds.Dy()),
-			A: 255,
+			A: 0xFFFF,
 		}
 		
 		sPos := int(     this.parent.value.S  * float64(bounds.Dx()))

container.go

@@ -1,6 +1,10 @@
 package objects
 
+import "image"
 import "git.tebibyte.media/tomo/tomo"
+import "git.tebibyte.media/tomo/tomo/event"
+
+var _ tomo.ContentObject = new(Container)
 
 // Container is an object that can contain other objects. It can be used as a
 // primitive for building more complex layouts. It has two variants: an outer
@@ -8,14 +12,14 @@ import "git.tebibyte.media/tomo/tomo"
 // its edges, whereas the inner container does not. The container will have a
 // corresponding object role variation of either "outer" or "inner".
 type Container struct {
-	tomo.ContainerBox
+	box tomo.ContainerBox
 }
 
 func newContainer (layout tomo.Layout, children ...tomo.Object) *Container {
 	this := &Container {
-		ContainerBox: tomo.NewContainerBox(),
+		box: tomo.NewContainerBox(),
 	}
-	this.SetAttr(tomo.ALayout(layout))
+	this.box.SetAttr(tomo.ALayout(layout))
 	for _, child := range children {
 		this.Add(child)
 	}
@@ -27,8 +31,8 @@ func newContainer (layout tomo.Layout, children ...tomo.Object) *Container {
 // window, tab pane, etc.
 func NewOuterContainer (layout tomo.Layout, children ...tomo.Object) *Container {
 	this := newContainer(layout, children...)
-	this.SetRole(tomo.R("objects", "Container"))
+	this.box.SetRole(tomo.R("objects", "Container"))
-	this.SetTag("outer", true)
+	this.box.SetTag("outer", true)
 	return this
 }
 
@@ -36,16 +40,87 @@ func NewOuterContainer (layout tomo.Layout, children ...tomo.Object) *Container
 // around it. It is meant to be used as a root container for a ScrollContainer.
 func NewSunkenContainer (layout tomo.Layout, children ...tomo.Object) *Container {
 	this := newContainer(layout, children...)
-	this.SetRole(tomo.R("objects", "Container"))
+	this.box.SetRole(tomo.R("objects", "Container"))
-	this.SetTag("sunken", true)
+	this.box.SetTag("sunken", true)
 	return this
 }
 
 // NewInnerContainer creates a new container that has no padding around it.
 func NewInnerContainer (layout tomo.Layout, children ...tomo.Object) *Container {
 	this := newContainer(layout, children...)
-	this.SetRole(tomo.R("objects", "Container"))
+	this.box.SetRole(tomo.R("objects", "Container"))
-	this.SetTag("inner", true)
+	this.box.SetTag("inner", true)
 	return this
 }
 
+// GetBox returns the underlying box.
+func (this *Container) GetBox () tomo.Box {
+	return this.box
+}
+
+// ContentBounds returns the bounds of the inner content of the container
+// relative to the container's InnerBounds.
+func (this *Container) ContentBounds () image.Rectangle {
+	return this.box.ContentBounds()
+}
+
+// ScrollTo shifts the origin of the container's content to the origin of the
+// container's InnerBounds, offset by the given point.
+func (this *Container) ScrollTo (position image.Point) {
+	this.box.ScrollTo(position)
+}
+
+// OnContentBoundsChange specifies a function to be called when the container's
+// ContentBounds or InnerBounds changes.
+func (this *Container) OnContentBoundsChange (callback func ()) event.Cookie {
+	return this.box.OnContentBoundsChange(callback)
+}
+
+// SetLayout sets the layout of the container.
+func (this *Container) SetLayout (layout tomo.Layout) {
+	this.box.SetAttr(tomo.ALayout(layout))
+}
+
+// SetAlign sets the X and Y alignment of the container.
+func (this *Container) SetAlign (x, y tomo.Align) {
+	this.box.SetAttr(tomo.AAlign(x, y))
+}
+
+// SetOverflow sets the X and Y overflow of the container.
+func (this *Container) SetOverflow (x, y bool) {
+	this.box.SetAttr(tomo.AOverflow(x, y))
+}
+
+// Add appends a child object. If the object is already a child of another
+// object, it will be removed from that object first.
+func (this *Container) Add (object tomo.Object) {
+	this.box.Add(object)
+}
+
+// Remove removes a child object, if it is a child of this container.
+func (this *Container) Remove (object tomo.Object) {
+	this.box.Remove(object)
+}
+
+// Insert inserts a child object before a specified object. If the before object
+// is nil or is not contained within this container, the inserted object is
+// appended. If the inserted object is already a child of another object, it
+// will be removed from that object first.
+func (this *Container) Insert (child tomo.Object, before tomo.Object) {
+	this.box.Insert(child, before)
+}
+
+// Clear removes all child objects.
+func (this *Container) Clear () {
+	this.box.Clear()
+}
+
+// Len returns hte amount of child objects.
+func (this *Container) Len () int {
+	return this.box.Len()
+}
+
+// At returns the child object at the specified index.
+func (this *Container) At (index int) tomo.Object {
+	return this.box.At(index)
+}

dialog.go

@@ -16,7 +16,7 @@ type DialogKind int; const (
 // Dialog is a modal dialog window.
 type Dialog struct {
 	tomo.Window
-	controlRow tomo.ContainerBox
+	controlRow *Container
 }
 
 type clickable interface {
@@ -53,6 +53,7 @@ func NewDialog (kind DialogKind, parent tomo.Window, title, message string, opti
 	case DialogError:       iconId = tomo.IconDialogError
 	}
 	dialog.SetTitle(title)
+	dialog.SetIcon(iconId)
 	icon := NewIcon(iconId, tomo.IconSizeLarge)
 	messageText := NewLabel(message)
 	messageText.SetAttr(tomo.AAlign(tomo.AlignStart, tomo.AlignMiddle))
@@ -63,7 +64,7 @@ func NewDialog (kind DialogKind, parent tomo.Window, title, message string, opti
 		}
 	}
 	dialog.controlRow = NewInnerContainer(layouts.ContractHorizontal, options...)
-	dialog.controlRow.SetAttr(tomo.AAlign(tomo.AlignEnd, tomo.AlignEnd))
+	dialog.controlRow.SetAlign(tomo.AlignEnd, tomo.AlignEnd)
 
 	dialog.SetRoot(NewOuterContainer (
 		layouts.Column { true, false },

dropdown.go

@@ -0,0 +1,128 @@
+package objects
+
+// import "image"
+import "git.tebibyte.media/tomo/tomo"
+import "git.tebibyte.media/tomo/tomo/input"
+import "git.tebibyte.media/tomo/tomo/event"
+import "git.tebibyte.media/tomo/objects/layouts"
+
+var _ tomo.Object = new(Dropdown)
+
+// Dropdown is a non-editable text input that allows the user to pick a value
+// from a list.
+type Dropdown struct {
+	box   tomo.ContainerBox
+	label *Label
+
+	value string
+	items []string
+	menu  *Menu
+
+	on struct {
+		valueChange event.FuncBroadcaster
+	}
+}
+
+// NewDropdown creates a new dropdown input with the specified items
+func NewDropdown (items ...string) *Dropdown {
+	dropdown := &Dropdown {
+		box: tomo.NewContainerBox(),
+		label:        NewLabel(""),
+	}
+	dropdown.box.SetRole(tomo.R("objects", "Dropdown"))
+	dropdown.box.SetAttr(tomo.ALayout(layouts.Row { true, false }))
+	dropdown.box.Add(dropdown.label)
+	dropdown.box.Add(NewIcon(tomo.IconListChoose, tomo.IconSizeSmall))
+	
+	dropdown.SetItems(items...)
+	if len(items) > 0 {
+		dropdown.SetValue(items[0])
+	}
+	
+	dropdown.box.SetInputMask(true)
+	dropdown.box.OnButtonDown(dropdown.handleButtonDown)
+	dropdown.box.OnButtonUp(dropdown.handleButtonUp)
+	dropdown.box.OnKeyDown(dropdown.handleKeyDown)
+	dropdown.box.OnKeyUp(dropdown.handleKeyUp)
+	dropdown.box.SetFocusable(true)
+	return dropdown
+}
+
+// GetBox returns the underlying box.
+func (this *Dropdown) GetBox () tomo.Box {
+	return this.box
+}
+
+// SetFocused sets whether or not this dropdown has keyboard focus. If set to
+// true, this method will steal focus away from whichever object currently has
+// focus.
+func (this *Dropdown) SetFocused (focused bool) {
+	this.box.SetFocused(focused)
+}
+
+// Value returns the value of the dropdown. This does not necissarily have to be
+// in the list of items.
+func (this *Dropdown) Value () string {
+	return this.value
+}
+
+// SetValue sets the value of the dropdown. This does not necissarily have to be
+// in the list of items.
+func (this *Dropdown) SetValue (value string) {
+	this.value = value
+	this.label.SetText(value)
+}
+
+// SetItems sets the items from which the user is able to pick.
+func (this *Dropdown) SetItems (items ...string) {
+	this.items = items
+}
+
+// Choose creates a menu that allows the user to pick a value.
+func (this *Dropdown) Choose () {
+	if this.menu != nil {
+		this.menu.Close()
+	}
+	menu, err := NewAnchoredMenu(this, this.itemList()...)
+	if err != nil { return }
+	this.menu = menu
+	menu.SetVisible(true)
+}
+
+func (this *Dropdown) itemList () []tomo.Object {
+	items := make([]tomo.Object, len(this.items))
+	for index, value := range this.items {
+		value := value
+		item := NewMenuItem(value)
+		item.OnClick(func () {
+			this.SetValue(value)
+			this.on.valueChange.Broadcast()
+		})
+		items[index] = item
+	}
+	return items
+}
+
+func (this *Dropdown) handleKeyDown (key input.Key, numberPad bool) bool {
+	if !isClickingKey(key) { return false }
+	this.Choose()
+	return true
+}
+
+func (this *Dropdown) handleKeyUp (key input.Key, numberPad bool) bool {
+	if !isClickingKey(key) { return false }
+	return true
+}
+
+func (this *Dropdown) handleButtonDown (button input.Button) bool {
+	if !isClickingButton(button) { return false }
+	return true
+}
+
+func (this *Dropdown) handleButtonUp (button input.Button) bool {
+	if !isClickingButton(button) { return false }
+	if this.box.Window().MousePosition().In(this.box.Bounds()) {
+		this.Choose()
+	}
+	return true
+}

go.mod

@@ -2,4 +2,4 @@ module git.tebibyte.media/tomo/objects
 
 go 1.20
 
-require git.tebibyte.media/tomo/tomo v0.45.0
+require git.tebibyte.media/tomo/tomo v0.46.1

go.sum

@@ -1,2 +1,2 @@
-git.tebibyte.media/tomo/tomo v0.45.0 h1:fQH0WIPidW275hOq9dE6R7p064xG1RGx2QU68Avlr84=
+git.tebibyte.media/tomo/tomo v0.46.1 h1:/8fT6I9l4TK529zokrThbNDHGRvUsNgif1Zs++0PBSQ=
-git.tebibyte.media/tomo/tomo v0.45.0/go.mod h1:WrtilgKB1y8O2Yu7X4mYcRiqOlPR8NuUnoA/ynkQWrs=
+git.tebibyte.media/tomo/tomo v0.46.1/go.mod h1:WrtilgKB1y8O2Yu7X4mYcRiqOlPR8NuUnoA/ynkQWrs=

heading.go

@@ -23,3 +23,9 @@ func NewHeading (level int, text string) *Heading {
 	return this
 }
 
+// NewMenuHeading creatss a new heading for use in menus.
+func NewMenuHeading (text string) *Heading {
+	heading := NewHeading(0, text)
+	heading.SetTag("menu", true)
+	return heading
+}

icon.go

@@ -33,6 +33,7 @@ func NewIcon (icon tomo.Icon, size tomo.IconSize) *Icon {
 func (this *Icon) SetIcon (icon tomo.Icon, size tomo.IconSize) {
 	if this.icon == icon { return }
 	this.icon = icon
+	this.size = size
 	this.setTexture(icon.Texture(size))
 }
 

input.go

@@ -0,0 +1,19 @@
+package objects
+
+import "git.tebibyte.media/tomo/tomo/input"
+
+func isClickingKey (key input.Key) bool {
+	return key == input.KeyEnter || key == input.Key(' ')
+}
+
+func isConfirmationKey (key input.Key) bool {
+	return key == input.KeyEnter
+}
+
+func isClickingButton (button input.Button) bool {
+	return button == input.ButtonLeft
+}
+
+func isMenuButton (button input.Button) bool {
+	return button == input.ButtonLeft
+}

internal/color.go

@@ -1,13 +1,32 @@
 package internal
 
+import "fmt"
+import "image/color"
+
+// HSV represents a color with hue, saturation, and value components. Each
+// component C is in range 0 <= C <= 1.
+type HSV struct {
+	H float64
+	S float64
+	V float64
+}
+
+// HSVA is an HSV color with an added 8-bit alpha component. The alpha component
+// ranges from 0x0000 (fully transparent) to 0xFFFF (opaque), and has no bearing
+// on the other components.
 type HSVA struct {
 	H float64
 	S float64
 	V float64
-	A uint8
+	A uint16
 }
 
-func (hsva HSVA) RGBA () (r, g, b, a uint32) {
+var (
+	HSVModel  color.Model = color.ModelFunc(hsvModel)
+	HSVAModel color.Model = color.ModelFunc(hsvaModel)
+)
+
+func (hsv HSV) RGBA () (r, g, b, a uint32) {
 	// Adapted from:
 	// https://www.cs.rit.edu/~ncs/color/t_convert.html
 	
@@ -15,34 +34,57 @@ func (hsva HSVA) RGBA () (r, g, b, a uint32) {
 		return uint32(float64(0xFFFF) * x)
 	}
 
-	ca := uint32(hsva.A) << 8
+	s := clamp01(hsv.S)
-	s := clamp01(hsva.S)
+	v := clamp01(hsv.V)
-	v := clamp01(hsva.V)
 	if s == 0 {
 		light := component(v)
-		return light, light, light, ca
+		return light, light, light, 0xFFFF
 	}
 	
-	h := clamp01(hsva.H) * 360
+	h := clamp01(hsv.H) * 360
 	sector := int(h / 60)
+	// otherwise when given 1.0 for H, sector would overflow to 6
+	if sector > 5 { sector = 5 }
 	offset := (h / 60) - float64(sector)
 	
-	fac := float64(hsva.A) / 255
+	p  := component(v * (1 - s))
-	p  := component(fac * v * (1 - s))
+	q  := component(v * (1 - s * offset))
-	q  := component(fac * v * (1 - s * offset))
+	t  := component(v * (1 - s * (1 - offset)))
-	t  := component(fac * v * (1 - s * (1 - offset)))
 	va := component(v)
 	
 	switch sector {
-	case 0:  return va, t,  p,  ca
+	case 0:  return va, t,  p,  0xFFFF
-	case 1:  return q,  va, p,  ca
+	case 1:  return q,  va, p,  0xFFFF
-	case 2:  return p,  va, t,  ca
+	case 2:  return p,  va, t,  0xFFFF
-	case 3:  return p,  q,  va, ca
+	case 3:  return p,  q,  va, 0xFFFF
-	case 4:  return t,  p,  va, ca
+	case 4:  return t,  p,  va, 0xFFFF
-	default: return va, p,  q,  ca
+	default: return va, p,  q,  0xFFFF
 	}
 }
 
+func (hsva HSVA) RGBA () (r, g, b, a uint32) {
+	r, g, b, a = HSV {
+		H: hsva.H,
+		S: hsva.S,
+		V: hsva.V,
+	}.RGBA()
+	a = uint32(hsva.A)
+	// alpha premultiplication
+	r = (r * a) / 0xFFFF
+	g = (g * a) / 0xFFFF
+	b = (b * a) / 0xFFFF
+	return
+}
+
+// Canon returns the color but with the H, S, and V fields are constrained to
+// the range 0.0-1.0
+func (hsv HSV) Canon () HSV {
+	hsv.H = clamp01(hsv.H)
+	hsv.S = clamp01(hsv.S)
+	hsv.V = clamp01(hsv.V)
+	return hsv
+}
+
 // Canon returns the color but with the H, S, and V fields are constrained to
 // the range 0.0-1.0
 func (hsva HSVA) Canon () HSVA {
@@ -58,7 +100,38 @@ func clamp01 (x float64) float64 {
 	return x
 }
 
-func RGBAToHSVA (r, g, b, a uint32) HSVA {
+func hsvModel (c color.Color) color.Color {
+	switch c := c.(type) {
+	case HSV:  return c
+	case HSVA: return HSV { H: c.H, S: c.S, V: c.V }
+	default:
+		r, g, b, a := c.RGBA()
+		// alpha unpremultiplication
+		r = (r / a) * 0xFFFF
+		g = (g / a) * 0xFFFF
+		b = (b / a) * 0xFFFF
+		return rgbToHSV(r, g, b)
+	}
+}
+
+func hsvaModel (c color.Color) color.Color {
+	switch c := c.(type) {
+	case HSV:  return HSVA { H: c.H, S: c.S, V: c.V, A: 0xFFFF }
+	case HSVA: return c
+	default:
+		r, g, b, a := c.RGBA()
+		hsv := rgbToHSV(r, g, b)
+
+		return HSVA {
+			H: hsv.H,
+			S: hsv.S,
+			V: hsv.V,
+			A: uint16(a),
+		}
+	}
+}
+
+func rgbToHSV (r, g, b uint32) HSV {
 	// Adapted from:
 	// https://www.cs.rit.edu/~ncs/color/t_convert.html
 	
@@ -78,27 +151,81 @@ func RGBAToHSVA (r, g, b, a uint32) HSVA {
 	if cg < minComponent { minComponent = cg }
 	if cb < minComponent { minComponent = cb }
 	
-	hsva := HSVA {
+	hsv := HSV {
 		V: maxComponent,
-		A: uint8(a >> 8),
 	}
 	
 	delta := maxComponent - minComponent
 	if delta == 0 {
 		// hsva.S is undefined, so hue doesn't matter
-		return hsva
+		return hsv
 	}
-	hsva.S = delta / maxComponent
+	hsv.S = delta / maxComponent
 	
 	switch {
-	case cr == maxComponent: hsva.H =     (cg - cb) / delta
+	case cr == maxComponent: hsv.H =     (cg - cb) / delta
-	case cg == maxComponent: hsva.H = 2 + (cb - cr) / delta
+	case cg == maxComponent: hsv.H = 2 + (cb - cr) / delta
-	case cb == maxComponent: hsva.H = 4 + (cr - cg) / delta
+	case cb == maxComponent: hsv.H = 4 + (cr - cg) / delta
 	}
 	
-	hsva.H *= 60
+	hsv.H *= 60
-	if hsva.H < 0 { hsva.H += 360 }
+	if hsv.H < 0 { hsv.H += 360 }
-	hsva.H /= 360
+	hsv.H /= 360
 	
-	return hsva
+	return hsv
+}
+
+// FormatNRGBA formats an NRGBA value into a hex string.
+func FormatNRGBA (nrgba color.NRGBA) string {
+	return fmt.Sprintf("%02X%02X%02X%02X", nrgba.R, nrgba.G, nrgba.B, nrgba.A)
+}
+
+// ParseNRGBA parses an NRGBA value from a hex string. It can be of the format:
+//   - RGB
+//   - RGBA
+//   - RRGGBB
+//   - RRGGBBAA
+// If none of these are specified, this function will return an opaque black
+// color. Hex digits may either be upper case or lower case.
+func ParseNRGBA (str string) color.NRGBA {
+	runes := []rune(str)
+	c := color.NRGBA { A: 255 }
+	switch len(runes) {
+	case 3:
+		c.R = fillOctet(hexDigit(runes[0]))
+		c.G = fillOctet(hexDigit(runes[1]))
+		c.B = fillOctet(hexDigit(runes[2]))
+	case 4:
+		c.R = fillOctet(hexDigit(runes[0]))
+		c.G = fillOctet(hexDigit(runes[1]))
+		c.B = fillOctet(hexDigit(runes[2]))
+		c.A = fillOctet(hexDigit(runes[3]))
+	case 6:
+		c.R = hexOctet(runes[0], runes[1])
+		c.G = hexOctet(runes[2], runes[3])
+		c.B = hexOctet(runes[4], runes[5])
+	case 8:
+		c.R = hexOctet(runes[0], runes[1])
+		c.G = hexOctet(runes[2], runes[3])
+		c.B = hexOctet(runes[4], runes[5])
+		c.A = hexOctet(runes[6], runes[7])
+	}
+	return c
+}
+
+func hexDigit (r rune) uint8 {
+	switch {
+	case r >= '0' && r <= '9': return uint8(r - '0')
+	case r >= 'A' && r <= 'F': return uint8(r - 'A') + 10
+	case r >= 'a' && r <= 'f': return uint8(r - 'a') + 10
+	default: return 0
+	}
+}
+
+func fillOctet (low uint8) uint8 {
+	return low << 4 | low
+}
+
+func hexOctet (high, low rune) uint8 {
+	return hexDigit(high) << 4 | hexDigit(low)
 }

labelcheckbox.go

@@ -55,12 +55,12 @@ func (this *LabelCheckbox) OnValueChange (callback func ()) event.Cookie {
 }
 
 func (this *LabelCheckbox) handleButtonDown (button input.Button) bool {
-	if button != input.ButtonLeft { return false }
+	if !isClickingButton(button) { return false }
 	return true
 }
 
 func (this *LabelCheckbox) handleButtonUp (button input.Button) bool {
-	if button != input.ButtonLeft { return false }
+	if !isClickingButton(button) { return false }
 	if this.Window().MousePosition().In(this.Bounds()) {
 		this.checkbox.SetFocused(true)
 		this.checkbox.Toggle()

labelswatch.go

@@ -24,6 +24,8 @@ func NewLabelSwatch (value color.Color, text string) *LabelSwatch {
 	box.SetRole(tomo.R("objects", "LabelSwatch"))
 	box.swatch.label = text
 	box.label.SetAttr(tomo.AAlign(tomo.AlignStart, tomo.AlignMiddle))
+	box.label.SetSelectable(false)
+	box.label.SetFocusable(false)
 	box.Add(box.swatch)
 	box.Add(box.label)
 	box.SetAttr(tomo.ALayout(layouts.Row { false, true }))
@@ -61,12 +63,12 @@ func (this *LabelSwatch) OnConfirm (callback func ()) event.Cookie {
 }
 
 func (this *LabelSwatch) handleButtonDown (button input.Button) bool {
-	if button != input.ButtonLeft { return true }
+	if !isClickingButton(button) { return true }
 	return true
 }
 
 func (this *LabelSwatch) handleButtonUp (button input.Button) bool {
-	if button != input.ButtonLeft { return true }
+	if !isClickingButton(button) { return true }
 	if this.Window().MousePosition().In(this.Bounds()) {
 		this.swatch.SetFocused(true)
 		this.swatch.Choose()

menu.go

@@ -18,23 +18,28 @@ type Menu struct {
 }
 
 // NewMenu creates a new menu with the specified items. The menu will appear
-// directly under the anchor Object. If the anchor is nil, it will appear
+// directly under the mouse pointer.
-// directly under the mouse pointer instead.
+func NewMenu (parent tomo.Window, items ...tomo.Object) (*Menu, error) {
-func NewMenu (anchor tomo.Object, items ...tomo.Object) (*Menu, error) {
+	bounds := (image.Rectangle { }).Add(parent.MousePosition())
-	menu := &Menu { }
+	return newMenu(parent, bounds, items...)
-	if anchor == nil {
+}
-		// TODO: *actually* put it under the mouse
-		window, err := tomo.NewWindow(menu.bounds)
-		if err != nil { return nil, err }
-		menu.Window = window
-	} else {
-		menu.bounds = menuBoundsFromAnchor(anchor)
-		menu.parent = anchor.GetBox().Window()
-		window, err := menu.parent.NewMenu(menu.bounds)
-		if err != nil { return nil, err }
-		menu.Window = window
-	}
 
+// NewAnchoredMenu creates a new menu with the specified items. The menu will
+// appear directly under the anchor.
+func NewAnchoredMenu (anchor tomo.Object, items ...tomo.Object) (*Menu, error) {
+	parent := anchor.GetBox().Window()
+	bounds := menuBoundsFromAnchor(anchor)
+	return newMenu(parent, bounds, items...)
+}
+
+func newMenu (parent tomo.Window, bounds image.Rectangle, items ...tomo.Object) (*Menu, error) {
+	menu := &Menu { }
+	menu.bounds = bounds
+	menu.parent = parent
+	window, err := menu.parent.NewMenu(menu.bounds)
+	if err != nil { return nil, err }
+	menu.Window = window
+	
 	menu.rootContainer = tomo.NewContainerBox()
 	menu.rootContainer.SetAttr(tomo.ALayout(layouts.ContractVertical))
 
@@ -67,6 +72,7 @@ func (this *Menu) TearOff () {
 	this.torn = true
 
 	window, err := this.parent.NewChild(this.bounds)
+	window.SetIcon(tomo.IconListChoose)
 	if err != nil { return }
 
 	visible := this.Window.Visible()
@@ -74,6 +80,7 @@ func (this *Menu) TearOff () {
 	this.Window.Close()
 
 	this.rootContainer.Remove(this.tearLine)
+	this.rootContainer.SetTag("torn", true)
 	
 	this.Window = window
 	this.Window.SetRoot(this.rootContainer)
@@ -84,21 +91,27 @@ func (this *Menu) newTearLine () tomo.Object {
 	tearLine := tomo.NewBox()
 	tearLine.SetRole(tomo.R("objects", "TearLine"))
 	tearLine.SetFocusable(true)
+	tearLine.OnMouseEnter(func () {
+		tearLine.SetFocused(true)
+	})
+	tearLine.OnMouseLeave(func () {
+		tearLine.SetFocused(false)
+	})
 	tearLine.OnKeyDown(func (key input.Key, numberPad bool) bool {
-		if key != input.KeyEnter && key != input.Key(' ') { return false }
+		if !isClickingKey(key) { return false }
 		return true
 	})
 	tearLine.OnKeyUp(func (key input.Key, numberPad bool) bool {
-		if key != input.KeyEnter && key != input.Key(' ') { return false }
+		if !isClickingKey(key) { return false }
 		this.TearOff()
 		return true
 	})
 	tearLine.OnButtonDown(func (button input.Button) bool {
-		if button != input.ButtonLeft { return false }
+		if !isClickingButton(button) { return false }
 		return true
 	})
 	tearLine.OnButtonUp(func (button input.Button) bool {
-		if button != input.ButtonLeft { return false }
+		if !isClickingButton(button) { return false }
 		if tearLine.Window().MousePosition().In(tearLine.Bounds()) {
 			this.TearOff()
 		}

menuitem.go

@@ -20,10 +20,15 @@ type MenuItem struct {
 
 // NewMenuItem creates a new menu item with the specified text.
 func NewMenuItem (text string) *MenuItem {
+	return NewIconMenuItem(tomo.IconUnknown, text)
+}
+
+// NewIconMenuItem creates a new menu item with the specified icon and text.
+func NewIconMenuItem (icon tomo.Icon, text string) *MenuItem {
 	box := &MenuItem {
 		ContainerBox: tomo.NewContainerBox(),
 		label:        NewLabel(text),
-		icon:         NewIcon("", tomo.IconSizeSmall),
+		icon:         NewIcon(icon, tomo.IconSizeSmall),
 	}
 	box.SetRole(tomo.R("objects", "MenuItem"))
 	box.label.SetAttr(tomo.AAlign(tomo.AlignStart, tomo.AlignMiddle))
@@ -33,6 +38,8 @@ func NewMenuItem (text string) *MenuItem {
 	box.Add(box.label)
 	
 	box.SetInputMask(true)
+	box.OnMouseEnter(box.handleMouseEnter)
+	box.OnMouseLeave(box.handleMouseLeave)
 	box.OnButtonDown(box.handleButtonDown)
 	box.OnButtonUp(box.handleButtonUp)
 	box.OnKeyDown(box.handleKeyDown)
@@ -49,8 +56,7 @@ func (this *MenuItem) SetText (text string) {
 // SetIcon sets an icon for this item. Setting the icon to IconUnknown will
 // remove it.
 func (this *MenuItem) SetIcon (id tomo.Icon) {
-	if this.icon != nil { this.Remove(this.icon) }
+	this.icon.SetIcon(id, tomo.IconSizeSmall)
-	this.Insert(NewIcon(id, tomo.IconSizeSmall), this.label)
 }
 
 // OnClick specifies a function to be called when the menu item is clicked.
@@ -58,6 +64,14 @@ func (this *MenuItem) OnClick (callback func ()) event.Cookie {
 	return this.on.click.Connect(callback)
 }
 
+func (this *MenuItem) handleMouseEnter () {
+	this.SetFocused(true)
+}
+
+func (this *MenuItem) handleMouseLeave () {
+	this.SetFocused(false)
+}
+
 func (this *MenuItem) handleKeyDown (key input.Key, numberPad bool) bool {
 	if key != input.KeyEnter && key != input.Key(' ') { return false }
 	return true

scrollbar.go

@@ -9,7 +9,7 @@ import "git.tebibyte.media/tomo/tomo/event"
 // overflowing ContainerBox.
 type Scrollbar struct {
 	tomo.ContainerBox
-	handle     *SliderHandle
+	handle     *sliderHandle
 	layout     scrollbarLayout
 	dragging   bool
 	dragOffset image.Point
@@ -24,7 +24,7 @@ type Scrollbar struct {
 func newScrollbar (orient string) *Scrollbar {
 	this := &Scrollbar {
 		ContainerBox: tomo.NewContainerBox(),
-		handle: &SliderHandle {
+		handle: &sliderHandle {
 			Box: tomo.NewBox(),
 		},
 		layout: scrollbarLayout {
@@ -43,9 +43,9 @@ func newScrollbar (orient string) *Scrollbar {
 	this.OnMouseMove(this.handleMouseMove)
 	this.OnScroll(this.handleScroll)
 	
-	this.handle.SetRole(tomo.R("objects", "SliderHandle"))
+	this.handle.SetRole(tomo.R("objects", "ScrollbarHandle"))
 	this.handle.SetTag(orient, true)
-	this.SetRole(tomo.R("objects", "Slider"))
+	this.SetRole(tomo.R("objects", "Scrollbar"))
 	this.SetTag(orient, true)
 	return this
 }

slider.go

@@ -9,7 +9,7 @@ import "git.tebibyte.media/tomo/tomo/event"
 // Slider is a control that selects a numeric value between 0 and 1.
 type Slider struct {
 	tomo.ContainerBox
-	handle     *SliderHandle
+	handle     *sliderHandle
 	layout     sliderLayout
 	dragging   bool
 	dragOffset image.Point
@@ -21,16 +21,14 @@ type Slider struct {
 	}
 }
 
-// SliderHandle is a simple object that serves as a handle for sliders and
+type sliderHandle struct {
-// scrollbars. It is completely inert.
-type SliderHandle struct {
 	tomo.Box
 }
 
 func newSlider (orient string, value float64) *Slider {
 	this := &Slider {
 		ContainerBox: tomo.NewContainerBox(),
-		handle: &SliderHandle {
+		handle: &sliderHandle {
 			Box: tomo.NewBox(),
 		},
 		layout: sliderLayout {

swatch.go

@@ -8,6 +8,7 @@ import "git.tebibyte.media/tomo/tomo/input"
 import "git.tebibyte.media/tomo/tomo/event"
 import "git.tebibyte.media/tomo/tomo/canvas"
 import "git.tebibyte.media/tomo/objects/layouts"
+import "git.tebibyte.media/tomo/objects/internal"
 
 // Swatch displays a color, allowing the user to edit it by clicking on it.
 type Swatch struct {
@@ -91,32 +92,44 @@ func (this *Swatch) Choose () {
 	
 	committed := false
 	
-	colorPicker := NewColorPicker(this.Value())
+	colorPicker  := NewHSVAColorPicker(this.Value())
-	colorPicker.OnValueChange(func () {
-		this.userSetValue(colorPicker.Value())
-	})
-	
-	hexInput := NewTextInput("TODO")
-	
 	colorMemory  := this.value
+	hexInput     := NewTextInput("")
+	hexInput.SetFocused(true)
 	cancelButton := NewButton("Cancel")
 	cancelButton.SetIcon(tomo.IconDialogCancel)
+	okButton     := NewButton("OK")
+	okButton.SetIcon(tomo.IconDialogOkay)
+	
+	updateHexInput := func () {
+		nrgba := color.NRGBAModel.Convert(colorPicker.Value()).(color.NRGBA)
+		hexInput.SetValue(internal.FormatNRGBA(nrgba))
+	}
+	updateHexInput()
+	commit := func () {
+		committed = true
+		window.Close()
+	}
+	colorPicker.OnValueChange(func () {
+		this.userSetValue(colorPicker.Value())
+		updateHexInput()
+	})
+	hexInput.OnConfirm(commit)
+	hexInput.OnValueChange(func () {
+		nrgba := internal.ParseNRGBA(hexInput.Value())
+		this.userSetValue(nrgba)
+		colorPicker.SetValue(nrgba)
+	})
 	cancelButton.OnClick(func () {
 		window.Close()
 	})
-	okButton := NewButton("OK")
+	okButton.OnClick(commit)
-	okButton.SetFocused(true)
-	okButton.SetIcon(tomo.IconDialogOkay)
-	okButton.OnClick(func () {
-		committed = true
-		window.Close()
-	})
 	
 	controlRow := NewInnerContainer (
 		layouts.ContractHorizontal,
 		cancelButton,
 		okButton)
-	controlRow.SetAttr(tomo.AAlign(tomo.AlignEnd, tomo.AlignMiddle))
+	controlRow.SetAlign(tomo.AlignEnd, tomo.AlignMiddle)
 	window.SetRoot(NewOuterContainer (
 		layouts.Column { true, false },
 		colorPicker,
@@ -158,23 +171,23 @@ func (this *Swatch) userSetValue (value color.Color) {
 }
 
 func (this *Swatch) handleKeyDown (key input.Key, numberPad bool) bool {
-	if key != input.KeyEnter && key != input.Key(' ') { return false }
+	if !isClickingKey(key) { return false }
-	return true
-}
-
-func (this *Swatch) handleKeyUp (key input.Key, numberPad bool) bool {
-	if key != input.KeyEnter && key != input.Key(' ') { return false }
 	this.Choose()
 	return true
 }
 
+func (this *Swatch) handleKeyUp (key input.Key, numberPad bool) bool {
+	if !isClickingKey(key) { return false }
+	return true
+}
+
 func (this *Swatch) handleButtonDown (button input.Button) bool {
-	if button != input.ButtonLeft { return false }
+	if !isClickingButton(button) { return false }
 	return true
 }
 
 func (this *Swatch) handleButtonUp (button input.Button) bool {
-	if button != input.ButtonLeft { return false }
+	if !isClickingButton(button) { return false }
 	if this.Window().MousePosition().In(this.Bounds()) {
 		this.Choose()
 	}

tabbedcontainer.go

@@ -126,10 +126,10 @@ type tab struct {
 func (this *tab) setActive (active bool) {
 	if active {
 		this.SetRole(tomo.R("objects", "Tab"))
-		this.SetTag("active", false)
+		this.SetTag("active", true)
 	} else {
 		this.SetRole(tomo.R("objects", "Tab"))
-		this.SetTag("active", true)
+		this.SetTag("active", false)
 	}
 }
 

textinput.go

@@ -31,15 +31,25 @@ func NewTextInput (text string) *TextInput {
 	return this
 }
 
-// SetText sets the text content of the input.
+// SetValue sets the text content of the input.
-func (this *TextInput) SetText (text string) {
+func (this *TextInput) SetValue (text string) {
 	this.text = []rune(text)
 	this.TextBox.SetText(text)
 }
 
+// Value returns the text content of the input.
+func (this *TextInput) Value () string {
+	return string(this.text)
+}
+
+// SetText sets the text content of the input.
+func (this *TextInput) SetText (text string) {
+	this.SetValue(text)
+}
+
 // Text returns the text content of the input.
 func (this *TextInput) Text () string {
-	return string(this.text)
+	return this.Value()
 }
 
 // OnConfirm specifies a function to be called when the user presses enter
@@ -77,7 +87,7 @@ func (this *TextInput) handleKeyDown (key input.Key, numpad bool) bool {
 	} ()
 
 	switch {
-	case key == input.KeyEnter:
+	case isConfirmationKey(key):
 		this.on.confirm.Broadcast()
 		return true
 	case key == input.KeyBackspace:
@@ -88,11 +98,7 @@ func (this *TextInput) handleKeyDown (key input.Key, numpad bool) bool {
 		this.text, dot = text.Delete(this.text, dot, word)
 		changed = true
 		return true
-	case key == input.Key('a') && modifiers.Control:
+	case key.Printable() && !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
@@ -104,15 +110,13 @@ func (this *TextInput) handleKeyDown (key input.Key, numpad bool) bool {
 func (this *TextInput) handleKeyUp (key input.Key, numpad bool) bool {
 	modifiers := this.Window().Modifiers()
 	switch {
-	case key == input.KeyEnter:
+	case isConfirmationKey(key):
 		return true
 	case key == input.KeyBackspace:
 		return true
 	case key == input.KeyDelete:
 		return true
-	case key == input.Key('a') && modifiers.Control:
+	case key.Printable() && !modifiers.Control:
-		return true
-	case key.Printable():
 		return true
 	default:
 		return false