From cf56e8c47eeaff437870eea1f93f27607ff5a11d Mon Sep 17 00:00:00 2001
From: Greg <gmp@wow.st>
Date: Wed, 28 Aug 2019 11:54:32 -0400
Subject: [PATCH] Define giowrap.Horizontal and giowrap.Vertical as AxisOpts.

---
 cmd/cal/main.go    |  6 +++---
 cmd/hello/main.go  | 12 ++++++------
 cmd/scroll/main.go | 12 ++++++------
 main.go            |  2 ++
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/cmd/cal/main.go b/cmd/cal/main.go
index cf6a78b..9e418b0 100644
--- a/cmd/cal/main.go
+++ b/cmd/cal/main.go
@@ -112,8 +112,8 @@ func eventloop() {
 		gio.Color(color.RGBA{A: 0xff, R: 0xf0, G: 0xf0, B: 0xe0}))
 
 	margin := gio.NewInset(gio.Size(ui.Dp(10)))
-	f1 := gio.NewFlex(gio.Axis(layout.Vertical))
-	f2 := gio.NewFlex(gio.Axis(layout.Horizontal))
+	f1 := gio.NewFlex(gio.Vertical)
+	f2 := gio.NewFlex(gio.Horizontal)
 	sidegrid := gio.NewGrid(1)
 	yrs := make([]gio.Widget, 6)
 	curyr := sm.Year
@@ -125,7 +125,7 @@ func eventloop() {
 
 	var cal gio.Widget
 
-	f3 := gio.NewFlex(gio.Axis(layout.Vertical))
+	f3 := gio.NewFlex(gio.Vertical)
 	daygrid := gio.NewGrid(7)
 	sun := NewSLabel("Sun", &sm.Ws[time.Sunday], gio.Align(text.End))
 	mon := NewSLabel("Mon", &sm.Ws[time.Monday], gio.Align(text.End))
diff --git a/cmd/hello/main.go b/cmd/hello/main.go
index 07d5099..ac93117 100644
--- a/cmd/hello/main.go
+++ b/cmd/hello/main.go
@@ -103,11 +103,11 @@ func main1() {
 
 	e2 := giowrap.NewEditor("text 2", giowrap.Face(ctx.Faces.For(regular, ui.Sp(24))))
 
-	f1 := giowrap.NewFlex(giowrap.Axis(layout.Vertical))
+	f1 := giowrap.NewFlex(giowrap.Vertical)
 	OuterInset := giowrap.NewInset(giowrap.Size(ui.Dp(10)))
 	InnerInset := giowrap.NewInset(giowrap.Size(ui.Dp(10)))
 
-	f2 := giowrap.NewFlex(giowrap.Axis(layout.Horizontal))
+	f2 := giowrap.NewFlex(giowrap.Horizontal)
 
 	btn1 := NewButton(ctx.Faces.For(regular, ui.Sp(24)),
 		"push1", color.RGBA{A: 0xff, R: 0x3c, G: 0x98, B: 0xc6})
@@ -224,11 +224,11 @@ func main2() {
 
 	e2 := giowrap.NewEditor("text 2", giowrap.Face(ctx.Faces.For(regular, ui.Sp(24))))
 
-	f1 := giowrap.NewFlex(giowrap.Axis(layout.Vertical))
+	f1 := giowrap.NewFlex(giowrap.Vertical)
 	OuterInset := giowrap.NewInset(giowrap.Size(ui.Dp(10)))
 	InnerInset := giowrap.NewInset(giowrap.Size(ui.Dp(10)))
 
-	f2 := giowrap.NewFlex(giowrap.Axis(layout.Horizontal))
+	f2 := giowrap.NewFlex(giowrap.Horizontal)
 
 	btn1 := NewButton(ctx.Faces.For(regular, ui.Sp(24)),
 		"push1", color.RGBA{A: 0xff, R: 0x3c, G: 0x98, B: 0xc6})
@@ -366,12 +366,12 @@ func main3() {
 				}
 				ctx.Reset(&e)
 				giowrap.NewInset(giowrap.Size(ui.Dp(10)))(
-					giowrap.NewFlex(giowrap.Axis(layout.Vertical))(
+					giowrap.NewFlex(giowrap.Vertical)(
 						e1,
 						//giowrap.Flexible(0.33),
 						giowrap.NewInset(giowrap.Size(ui.Dp(10)))(e2),
 						//giowrap.Flexible(0.67),
-						giowrap.NewFlex(giowrap.Axis(layout.Horizontal))(
+						giowrap.NewFlex(giowrap.Horizontal)(
 							giowrap.NewInset(giowrap.Size(ui.Dp(10)))(btn1),
 							//giowrap.Flexible(0.50),
 							giowrap.NewInset(giowrap.Size(ui.Dp(10)))(btn2),
diff --git a/cmd/scroll/main.go b/cmd/scroll/main.go
index 535f727..29a2c90 100644
--- a/cmd/scroll/main.go
+++ b/cmd/scroll/main.go
@@ -97,15 +97,15 @@ func eventloop() {
 	bg := gio.NewBackground(gio.Color(gray2))
 
 	margin := gio.NewInset(gio.Size(ui.Dp(10)))
-	f1 := gio.NewFlex(gio.Axis(layout.Horizontal))
+	f1 := gio.NewFlex(gio.Horizontal)
 	lbar := gio.NewLabel("    ", gio.Face(face))
-	f2 := gio.NewFlex(gio.Axis(layout.Vertical))
+	f2 := gio.NewFlex(gio.Vertical)
 	topbar := gio.NewLabel("Scroll X and Y. Click to select", gio.Face(face))
-	f3 := gio.NewFlex(gio.Axis(layout.Horizontal))
-	f4 := gio.NewFlex(gio.Axis(layout.Vertical))
+	f3 := gio.NewFlex(gio.Horizontal)
+	f4 := gio.NewFlex(gio.Vertical)
 
-	sh := gio.HScroll(gio.NewFlex(gio.Axis(layout.Horizontal)))
-	sv := gio.VScroll(gio.NewFlex(gio.Axis(layout.Vertical)))
+	sh := gio.HScroll(gio.NewFlex(gio.Horizontal))
+	sv := gio.VScroll(gio.NewFlex(gio.Vertical))
 
 	numrows := 16
 	numcols := 50
diff --git a/main.go b/main.go
index a644c3c..89cc5a2 100644
--- a/main.go
+++ b/main.go
@@ -204,6 +204,8 @@ type List = WidgetCombinator
 type AxisOpt struct{ axis layout.Axis }
 
 func Axis(x layout.Axis) AxisOpt { return AxisOpt{x} }
+var Horizontal = AxisOpt{ layout.Horizontal }
+var Vertical = AxisOpt{ layout.Vertical }
 
 type ListOpts struct {
 	AxisOpt