@@ 313,10 313,10 @@ func (t *Transition) Layout(gtx *layout.Context) {
clipCenter := f32.Point{X: diameter / 2, Y: diameter / 2}
off := op.TransformOp{}.Offset(center.Sub(clipCenter))
off.Add(gtx.Ops)
- clip.RoundRect(gtx.Ops,
- f32.Rectangle{Max: f32.Point{X: diameter, Y: diameter}},
- radius, radius, radius, radius,
- ).Add(gtx.Ops)
+ clip.Rect{
+ Rect: f32.Rectangle{Max: f32.Point{X: diameter, Y: diameter}},
+ NE: radius, NW: radius, SE: radius, SW: radius,
+ }.Op(gtx.Ops).Add(gtx.Ops)
off.Invert().Add(gtx.Ops)
fill{rgb(0xffffff)}.Layout(gtx)
}
@@ 731,11 731,11 @@ func (b *Background) Layout(gtx *layout.Context, w layout.Widget) {
if r > height/2 {
r = height / 2
}
- clip.RoundRect(gtx.Ops,
- f32.Rectangle{Max: f32.Point{
+ clip.Rect{
+ Rect: f32.Rectangle{Max: f32.Point{
X: width, Y: height,
- }}, r, r, r, r,
- ).Add(gtx.Ops)
+ }}, NW: r, NE: r, SW: r, SE: r,
+ }.Op(gtx.Ops).Add(gtx.Ops)
}
paint.ColorOp{Color: b.Color}.Add(gtx.Ops)
paint.PaintOp{Rect: f32.Rectangle{Max: f32.Point{X: width, Y: height}}}.Add(gtx.Ops)
@@ 1273,10 1273,10 @@ func (cc *clipCircle) Layout(gtx *layout.Context, w layout.Widget) {
rr := szf * .5
var stack op.StackOp
stack.Push(gtx.Ops)
- clip.RoundRect(gtx.Ops,
- f32.Rectangle{Max: f32.Point{X: szf, Y: szf}},
- rr, rr, rr, rr,
- ).Add(gtx.Ops)
+ clip.Rect{
+ Rect: f32.Rectangle{Max: f32.Point{X: szf, Y: szf}},
+ NE: rr, NW: rr, SE: rr, SW: rr,
+ }.Op(gtx.Ops).Add(gtx.Ops)
macro.Add(gtx.Ops)
stack.Pop()
}
@@ 3,7 3,7 @@ module scatter.im
go 1.13
require (
- gioui.org v0.0.0-20191109184610-d8c9cb426c41
+ gioui.org v0.0.0-20191118133714-3edd9dd8be33
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
@@ 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-20191109184610-d8c9cb426c41 h1:MC7OzV8nE8N1fBl3MgZLe8xquNkr+uezK0+1cnxrJFc=
-gioui.org v0.0.0-20191109184610-d8c9cb426c41/go.mod h1:KqFFi2Dq5gYA3FJ0sDOt8OBXoMsuxMtE8v2f0JExXAY=
+gioui.org v0.0.0-20191118133714-3edd9dd8be33 h1:jRqEmqxmsw8jlRoRgxuXw0t8BWE+riqCr/WPtoDV29M=
+gioui.org v0.0.0-20191118133714-3edd9dd8be33/go.mod h1:KqFFi2Dq5gYA3FJ0sDOt8OBXoMsuxMtE8v2f0JExXAY=
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=