diff --git a/cmd/go.mod b/cmd/go.mod index f5ecfa56..09a94bdd 100644 --- a/cmd/go.mod +++ b/cmd/go.mod @@ -3,7 +3,7 @@ module gioui.org/cmd go 1.13 require ( - gioui.org v0.0.0-20200609205719-d1ea9339d5a3 + gioui.org v0.0.0-20200609212308-6380baacb6c4 github.com/chromedp/cdproto v0.0.0-20191114225735-6626966fbae4 github.com/chromedp/chromedp v0.5.2 golang.org/x/image v0.0.0-20190802002840-cff245a6509b diff --git a/cmd/go.sum b/cmd/go.sum index 11f2612a..b6eff5ac 100644 --- a/cmd/go.sum +++ b/cmd/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-20200609205719-d1ea9339d5a3 h1:OtHUEpG7mEh9LLhlkVlsREK8FLu0K5W5ElosuXKHptg= -gioui.org v0.0.0-20200609205719-d1ea9339d5a3/go.mod h1:AHI9rFr6AEEHCb8EPVtb/p5M+NMJRKH58IOp8O3Je04= +gioui.org v0.0.0-20200609212308-6380baacb6c4 h1:f46RMK4xQe/lY6RKAVb+piVxookdTnb7LTddYsjgGt4= +gioui.org v0.0.0-20200609212308-6380baacb6c4/go.mod h1:AHI9rFr6AEEHCb8EPVtb/p5M+NMJRKH58IOp8O3Je04= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802 h1:1BDTz0u9nC3//pOCMdNH+CiXJVYJh5UQNCOBG7jbELc= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/chromedp/cdproto v0.0.0-20191114225735-6626966fbae4 h1:QD3KxSJ59L2lxG6MXBjNHxiQO2RmxTQ3XcK+wO44WOg= diff --git a/example/glfw/main.go b/example/glfw/main.go index eca89ab1..2f964a99 100644 --- a/example/glfw/main.go +++ b/example/glfw/main.go @@ -95,6 +95,7 @@ func main() { ops.Reset() gtx := layout.Context{ Ops: &ops, + Now: time.Now(), Queue: &queue, Config: &glfwConfig{scale}, Constraints: layout.Exact(sz), @@ -159,10 +160,6 @@ func registerCallbacks(window *glfw.Window, q *router.Router) { }) } -func (s *glfwConfig) Now() time.Time { - return time.Now() -} - func (s *glfwConfig) Px(v unit.Value) int { scale := s.Scale if v.U == unit.UnitPx { diff --git a/example/go.mod b/example/go.mod index 046ddcaf..8c728623 100644 --- a/example/go.mod +++ b/example/go.mod @@ -3,7 +3,7 @@ module gioui.org/example go 1.13 require ( - gioui.org v0.0.0-20200609205719-d1ea9339d5a3 + gioui.org v0.0.0-20200609212308-6380baacb6c4 github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72 github.com/google/go-github/v24 v24.0.1 diff --git a/example/go.sum b/example/go.sum index c58e3cfd..cd392287 100644 --- a/example/go.sum +++ b/example/go.sum @@ -1,7 +1,7 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -gioui.org v0.0.0-20200609205719-d1ea9339d5a3 h1:OtHUEpG7mEh9LLhlkVlsREK8FLu0K5W5ElosuXKHptg= -gioui.org v0.0.0-20200609205719-d1ea9339d5a3/go.mod h1:AHI9rFr6AEEHCb8EPVtb/p5M+NMJRKH58IOp8O3Je04= +gioui.org v0.0.0-20200609212308-6380baacb6c4 h1:f46RMK4xQe/lY6RKAVb+piVxookdTnb7LTddYsjgGt4= +gioui.org v0.0.0-20200609212308-6380baacb6c4/go.mod h1:AHI9rFr6AEEHCb8EPVtb/p5M+NMJRKH58IOp8O3Je04= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7 h1:SCYMcCJ89LjRGwEa0tRluNRiMjZHalQZrVrvTbPh+qw= github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7/go.mod h1:482civXOzJJCPzJ4ZOX/pwvXBWSnzD4OKMdH4ClKGbk= diff --git a/example/kitchen/kitchen.go b/example/kitchen/kitchen.go index 1cffbd0a..e8ac78cd 100644 --- a/example/kitchen/kitchen.go +++ b/example/kitchen/kitchen.go @@ -294,10 +294,6 @@ func kitchen(gtx layout.Context, th *material.Theme) layout.Dimensions { }) } -func (s *scaledConfig) Now() time.Time { - return time.Now() -} - func (s *scaledConfig) Px(v unit.Value) int { scale := s.Scale if v.U == unit.UnitPx { diff --git a/example/tabs/slider.go b/example/tabs/slider.go index f21a6c0e..72ca205b 100644 --- a/example/tabs/slider.go +++ b/example/tabs/slider.go @@ -39,13 +39,13 @@ func (s *Slider) Layout(gtx layout.Context, w layout.Widget) layout.Dimensions { s.next = nil s.lastCall = s.nextCall s.offset = float32(s.push) - s.t0 = gtx.Now() + s.t0 = gtx.Now s.push = 0 } var delta time.Duration if !s.t0.IsZero() { - now := gtx.Now() + now := gtx.Now delta = now.Sub(s.t0) s.t0 = now }