Update object code to use new containers

swatch.go

@@ -139,18 +139,16 @@ func (this *Swatch) Choose () {
 	})
 	okButton.OnClick(commit)
 	
-	controlRow := NewInnerContainer (
-		layouts.ContractHorizontal,
-		cancelButton,
-		okButton)
-	controlRow.SetAlign(tomo.AlignEnd, tomo.AlignMiddle)
-	window.SetRoot(NewOuterContainer (
+	window.SetRoot(NewRoot (
 		layouts.Column { true, false },
-		colorPicker,
-		NewInnerContainer(layouts.Row { false, true },
-			NewLabel("Hex"),
-			hexInput),
-		controlRow))
+		NewContentSegment (
+			layouts.Column { true, false },
+			colorPicker,
+			NewContainer (
+				layouts.Row { false, true },
+				NewLabel("Hex"),
+				hexInput)),
+		NewOptionSegment(nil, cancelButton, okButton)))
 	window.OnClose(func () {
 		if committed {
 			this.on.confirm.Broadcast()