Swatch accepts hex input

colorpicker.go

@@ -65,6 +65,7 @@ func (this *HSVAColorPicker) SetValue (value color.Color) {
 	this.value = internal.HSVAModel.Convert(value).(internal.HSVA)
 	this.hueSlider.SetValue(this.value.H)
 	this.alphaSlider.SetValue(float64(this.value.A) / 0xFFFF)
+	this.pickerMap.Invalidate()
 }
 
 // OnValueChange specifies a function to be called when the user changes the

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 {
@@ -92,25 +93,37 @@ func (this *Swatch) Choose () {
 	committed := false
 	
 	colorPicker  := NewHSVAColorPicker(this.Value())
-	colorPicker.OnValueChange(func () {
-		this.userSetValue(colorPicker.Value())
-	})
-	
-	hexInput := NewTextInput("TODO")
-	
 	colorMemory  := this.value
+	hexInput     := NewTextInput("TODO")
+	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.SetFocused(true)
-	okButton.SetIcon(tomo.IconDialogOkay)
-	okButton.OnClick(func () {
-		committed = true
-		window.Close()
-	})
+	okButton.OnClick(commit)
 	
 	controlRow := NewInnerContainer (
 		layouts.ContractHorizontal,