From 0389f41e570b5dd65dad01271f8d8727c0f72522 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Sun, 2 Feb 2020 17:22:25 +0100 Subject: [PATCH] cmd/scatter: update gio version Signed-off-by: Elias Naur --- cmd/scatter/ui.go | 12 ++++++------ go.mod | 2 +- go.sum | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cmd/scatter/ui.go b/cmd/scatter/ui.go index b27cb09..87ec73d 100644 --- a/cmd/scatter/ui.go +++ b/cmd/scatter/ui.go @@ -420,7 +420,7 @@ func (a *App) layoutTimings(gtx *layout.Context) { runtime.ReadMemStats(&mstats) mallocs := mstats.Mallocs - a.lastMallocs a.lastMallocs = mstats.Mallocs - layout.Align(layout.NE).Layout(gtx, func() { + layout.NE.Layout(gtx, func() { in := a.env.insets in.Top = unit.Max(gtx, unit.Dp(16), in.Top) in.Layout(gtx, func() { @@ -679,7 +679,7 @@ func (p *signInPage) layoutSigninForm(gtx *layout.Context) { }) default: in.Bottom = unit.Max(gtx, unit.Dp(32), p.env.insets.Bottom) - layout.Align(layout.E).Layout(gtx, func() { + layout.E.Layout(gtx, func() { in.Layout(gtx, func() { theme.Button("Sign in").Layout(gtx, p.submit) }) @@ -814,7 +814,7 @@ func (p *threadsPage) Layout(gtx *layout.Context) { ) }), layout.Stacked(func() { - layout.Align(layout.SE).Layout(gtx, func() { + layout.SE.Layout(gtx, func() { layout.Inset{ Right: unit.Max(gtx, unit.Dp(16), p.env.insets.Right), Bottom: unit.Max(gtx, unit.Dp(16), p.env.insets.Bottom), @@ -1073,7 +1073,7 @@ func (p *threadPage) layoutMessageBox(gtx *layout.Context) { Radius: unit.Dp(10), } bg.Layout(gtx, func() { - layout.Align(layout.W).Layout(gtx, func() { + layout.W.Layout(gtx, func() { gtx.Constraints.Width.Min = gtx.Constraints.Width.Max ed := theme.Editor("Send a message") ed.Font.Size = unit.Sp(14) @@ -1097,13 +1097,13 @@ func (p *threadPage) layoutMessageBox(gtx *layout.Context) { func (p *threadPage) message(gtx *layout.Context, index int) { msg := p.messages[index] in := layout.Inset{Top: unit.Dp(16), Left: unit.Dp(16), Right: unit.Dp(40)} - align := layout.Align(layout.W) + align := layout.W msgCol := rgb(0xffffff) bgcol := theme.Color.Primary timecol := argb(0xaaaaaaaa) if msg.Own { in.Left, in.Right = in.Right, in.Left - align = layout.Align(layout.E) + align = layout.E bgcol = rgb(0xeeeeee) msgCol = theme.Color.Text timecol = rgb(0x888888) diff --git a/go.mod b/go.mod index 333df6a..fae2fea 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module scatter.im go 1.13 require ( - gioui.org v0.0.0-20191211234831-0bfcac97344d + gioui.org v0.0.0-20200202161927-1cf8fee73ff1 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 diff --git a/go.sum b/go.sum index 80a0bee..39bc3bd 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,6 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -gioui.org v0.0.0-20191211234831-0bfcac97344d h1:yxzaD2asbV2q/oGukWJ1JrIBp0zm45RIA8ngnY9L6Ic= -gioui.org v0.0.0-20191211234831-0bfcac97344d/go.mod h1:KqFFi2Dq5gYA3FJ0sDOt8OBXoMsuxMtE8v2f0JExXAY= +gioui.org v0.0.0-20200202161927-1cf8fee73ff1 h1:IjoHKA5smXf09yeUrYpeqUYLCPNI4NF8VENzqTSq0zk= +gioui.org v0.0.0-20200202161927-1cf8fee73ff1/go.mod h1:AHI9rFr6AEEHCb8EPVtb/p5M+NMJRKH58IOp8O3Je04= 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= @@ -57,8 +57,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ= -golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9 h1:1/DFK4b7JH8DmkqhUk48onnSfrPzImPoVxuomtbT2nk= +golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -- 2.45.2