3102c217a59c972506e7204aae4f8d56c661d899 — Elias Naur 4 months ago bd06406
cmd/scatter: update gio version

Signed-off-by: Elias Naur <mail@eliasnaur.com>
3 files changed, 20 insertions(+), 20 deletions(-)

M cmd/scatter/ui.go
M go.mod
M go.sum
M cmd/scatter/ui.go => cmd/scatter/ui.go +13 -13
@@ 548,7 548,7 @@ func (p *contactsPage) Layout(c ui.Config, q input.Queue, ops *ui.Ops, cs layout
 	if l.Dragging() {
 		key.HideInputOp{}.Add(ops)
 	}
-	f := layout.Flex{Axis: layout.Vertical, MainAxisAlignment: layout.Start}
+	f := layout.Flex{Axis: layout.Vertical}
 	f.Init(ops, cs)
 	var dims layout.Dimens
 	cs = f.Rigid()


@@ 579,7 579,7 @@ func (p *contactsPage) contact(c ui.Config, ops *ui.Ops, cs layout.Constraints, 
 	click := &p.clicks[index]
 	in := layout.UniformInset(ui.Dp(8))
 	cs = in.Begin(c, ops, cs)
-	f := (&layout.Flex{CrossAxisAlignment: layout.Center}).Init(ops, cs)
+	f := (&layout.Flex{Alignment: layout.Middle}).Init(ops, cs)
 	var dims layout.Dimens
 	{
 		cs = f.Rigid()


@@ 631,7 631,7 @@ func (t *Topbar) Begin(c ui.Config, insets app.Insets, ops *ui.Ops, cs layout.Co
 	t.bg = t.stack.End(dims)
 	cs = t.stack.Rigid()
 	cs = t.insets2.Begin(c, ops, cs)
-	t.flex = layout.Flex{CrossAxisAlignment: layout.Center}
+	t.flex = layout.Flex{Alignment: layout.Middle}
 	t.flex.Init(ops, cs)
 	cs = t.flex.Rigid()
 	dims = layout.Dimens{}


@@ 709,7 709,7 @@ func (p *signInPage) Event(c ui.Config, q input.Queue) interface{} {
 
 func (p *signInPage) Layout(c ui.Config, q input.Queue, ops *ui.Ops, cs layout.Constraints) layout.Dimens {
 	var dims layout.Dimens
-	f := layout.Flex{Axis: layout.Vertical, MainAxisAlignment: layout.Start}
+	f := layout.Flex{Axis: layout.Vertical}
 	f.Init(ops, cs)
 
 	cs = f.Rigid()


@@ 907,7 907,7 @@ func (p *threadsPage) Layout(c ui.Config, q input.Queue, ops *ui.Ops, cs layout.
 	var dims layout.Dimens
 	cs = st.Rigid()
 	{
-		f := layout.Flex{Axis: layout.Vertical, MainAxisAlignment: layout.Start}
+		f := layout.Flex{Axis: layout.Vertical}
 		f.Init(ops, cs)
 
 		cs = f.Rigid()


@@ 981,7 981,7 @@ func (p *threadsPage) thread(c ui.Config, ops *ui.Ops, cs layout.Constraints, in
 		font = fonts.bold
 	}
 	click := &p.clicks[index]
-	elem := layout.Flex{Axis: layout.Vertical, MainAxisAlignment: layout.Start, CrossAxisAlignment: layout.Start}
+	elem := layout.Flex{Axis: layout.Vertical}
 	elem.Init(ops, cs)
 	cs = elem.Rigid()
 	var dims layout.Dimens


@@ 1166,7 1166,7 @@ func (p *threadPage) Layout(c ui.Config, q input.Queue, ops *ui.Ops, cs layout.C
 	default:
 	}
 	var dims layout.Dimens
-	f := layout.Flex{Axis: layout.Vertical, MainAxisAlignment: layout.Start}
+	f := layout.Flex{Axis: layout.Vertical}
 	f.Init(ops, cs)
 	{
 		cs = f.Rigid()


@@ 1218,7 1218,7 @@ func (p *threadPage) layoutMessageBox(c ui.Config, q input.Queue, ops *ui.Ops, c
 	if mh := c.Px(ui.Dp(100)); cs.Height.Max > mh {
 		cs.Height.Max = mh
 	}
-	f := (&layout.Flex{CrossAxisAlignment: layout.End}).Init(ops, cs)
+	f := (&layout.Flex{Alignment: layout.End}).Init(ops, cs)
 
 	var dims layout.Dimens
 	var sendHeight int


@@ 1279,7 1279,7 @@ func (p *threadPage) message(c ui.Config, ops *ui.Ops, cs layout.Constraints, in
 			Radius:   ui.Dp(10),
 		}
 		cs = bg.Begin(c, ops, cs)
-		f := layout.Flex{Axis: layout.Vertical, MainAxisAlignment: layout.Start, CrossAxisAlignment: layout.Start}
+		f := layout.Flex{Axis: layout.Vertical}
 		f.Init(ops, cs)
 
 		cs = f.Rigid()


@@ 1292,7 1292,7 @@ func (p *threadPage) message(c ui.Config, ops *ui.Ops, cs layout.Constraints, in
 		cs = f.Rigid()
 		{
 			cs.Width.Min = msgWidth
-			f := layout.Flex{Axis: layout.Horizontal, MainAxisAlignment: layout.SpaceBetween, CrossAxisAlignment: layout.Center}
+			f := layout.Flex{Axis: layout.Horizontal, Spacing: layout.SpaceBetween, Alignment: layout.Middle}
 			f.Init(ops, cs)
 
 			cs = f.Rigid()


@@ 1409,15 1409,15 @@ func (f fill) Layout(ops *ui.Ops, cs layout.Constraints) layout.Dimens {
 }
 
 func column() layout.Flex {
-	return layout.Flex{Axis: layout.Vertical, MainAxisAlignment: layout.Start, CrossAxisAlignment: layout.Start}
+	return layout.Flex{Axis: layout.Vertical}
 }
 
 func centerRowOpts() layout.Flex {
-	return layout.Flex{Axis: layout.Horizontal, MainAxisAlignment: layout.Start, CrossAxisAlignment: layout.Center}
+	return layout.Flex{Axis: layout.Horizontal, Alignment: layout.Middle}
 }
 
 func baseline() layout.Flex {
-	return layout.Flex{Axis: layout.Horizontal, CrossAxisAlignment: layout.Baseline}
+	return layout.Flex{Axis: layout.Horizontal, Alignment: layout.Baseline}
 }
 
 type clipCircle struct {

M go.mod => go.mod +2 -2
@@ 3,8 3,8 @@ module scatter.im
 go 1.13
 
 require (
-	gioui.org/cmd v0.0.0-20190807181525-20f9a72c1571 // indirect
-	gioui.org/ui v0.0.0-20190807183537-4e005f2bfa1c
+	gioui.org/cmd v0.0.0-20190810103458-6d1339733a1d // indirect
+	gioui.org/ui v0.0.0-20190810102917-1a15d7241ac4
 	github.com/eliasnaur/libsignal-protocol-go v0.0.0-20190626062856-3295f72b181e
 	github.com/emersion/go-imap v1.0.0-rc.1
 	github.com/emersion/go-imap-idle v0.0.0-20190519112320-2704abd7050e

M go.sum => go.sum +5 -5
@@ 1,8 1,8 @@
-gioui.org v0.0.0-20190807152134-6e26c92c7553 h1:TEPtJ8ilc4uETV9T6vS69XifDObJqgNEKUBGrPi21Ak=
-gioui.org/cmd v0.0.0-20190807181525-20f9a72c1571 h1:k0BfbLysA24S3WPYhDyvD6J6I37l+iE9q1eWeGnz3OY=
-gioui.org/cmd v0.0.0-20190807181525-20f9a72c1571/go.mod h1:UMcjphQ+C0R8Cm60PoNW4LZwPzFFSXYCvw0cY+YPQUM=
-gioui.org/ui v0.0.0-20190807183537-4e005f2bfa1c h1:94x8U24Sg+CBwMILZj+DziuWDflZlo+btkNp3iVUnMY=
-gioui.org/ui v0.0.0-20190807183537-4e005f2bfa1c/go.mod h1:jbaSHnW/jO2+8gOhOraRz7/3A2tntNzXF9nra6FUOr4=
+gioui.org v0.0.0-20190810103458-6d1339733a1d h1:DIDUDEB6us6ykMtrAybcQOhANn7Z81SmLuX3BvErM6c=
+gioui.org/cmd v0.0.0-20190810103458-6d1339733a1d h1:VC/Fql8Eaf6AeVttrHkwGgwwzMZ3OW8RREL6mImUABc=
+gioui.org/cmd v0.0.0-20190810103458-6d1339733a1d/go.mod h1:UMcjphQ+C0R8Cm60PoNW4LZwPzFFSXYCvw0cY+YPQUM=
+gioui.org/ui v0.0.0-20190810102917-1a15d7241ac4 h1:XFJjHD8dzAVl2/zCueTXiB/i4B3kiFLdY0Hm67m7XhU=
+gioui.org/ui v0.0.0-20190810102917-1a15d7241ac4/go.mod h1:jbaSHnW/jO2+8gOhOraRz7/3A2tntNzXF9nra6FUOr4=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/RadicalApp/complete v0.0.0-20170329192659-17e6c0ee499b h1:cAULFohNVfNzco0flF4okSPg3s7/tCj+hMIldtYZo4c=
 github.com/RadicalApp/complete v0.0.0-20170329192659-17e6c0ee499b/go.mod h1:zZ3+l0EkpT2ZPnoamPBG50PBUtQrXwwyJ6elQZMmqgk=