joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-05 17:35:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

example,cmd: bump gio version

Browse Source 
Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2020-06-07 16:33:27 +02:00
parent f710bdf8e8
commit 352856fc24
9 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/go.mod
+1 -1
View File
@@ -3,7 +3,7 @@ module gioui.org/cmd
go 1.13 go 1.13
require ( require (
gioui.org v0.0.0-20200607064236-483084f4becd gioui.org v0.0.0-20200607143106-f710bdf8e8f1
github.com/chromedp/cdproto v0.0.0-20191114225735-6626966fbae4 github.com/chromedp/cdproto v0.0.0-20191114225735-6626966fbae4
github.com/chromedp/chromedp v0.5.2 github.com/chromedp/chromedp v0.5.2
golang.org/x/image v0.0.0-20190802002840-cff245a6509b golang.org/x/image v0.0.0-20190802002840-cff245a6509b
cmd/go.sum
+2 -2
View File
@@ -1,6 +1,6 @@
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
gioui.org v0.0.0-20200607064236-483084f4becd h1:qnVH6k93cRgl8UJ2lfSPqFpz/3C8iz/hCrme6+CEBz4= gioui.org v0.0.0-20200607143106-f710bdf8e8f1 h1:mkhlEjXxmINvmSyI+MMwSJUFHFYoBd/7hPvijrO9v/w=
gioui.org v0.0.0-20200607064236-483084f4becd/go.mod h1:AHI9rFr6AEEHCb8EPVtb/p5M+NMJRKH58IOp8O3Je04= gioui.org v0.0.0-20200607143106-f710bdf8e8f1/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 h1:1BDTz0u9nC3//pOCMdNH+CiXJVYJh5UQNCOBG7jbELc=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= 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= github.com/chromedp/cdproto v0.0.0-20191114225735-6626966fbae4 h1:QD3KxSJ59L2lxG6MXBjNHxiQO2RmxTQ3XcK+wO44WOg=
example/glfw/main.go
+1 -2
View File
@@ -69,11 +69,10 @@ func main() {
// Enable sRGB. // Enable sRGB.
gl.Enable(gl.FRAMEBUFFER_SRGB) gl.Enable(gl.FRAMEBUFFER_SRGB)
gofont.Register()
f := new(goglFunctions) f := new(goglFunctions)
var queue router.Router var queue router.Router
var ops op.Ops var ops op.Ops
th := material.NewTheme() th := material.NewTheme(gofont.Collection())
backend, err := giogl.NewBackend(f) backend, err := giogl.NewBackend(f)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
example/go.mod
+1 -1
View File
@@ -3,7 +3,7 @@ module gioui.org/example
go 1.13 go 1.13
require ( require (
gioui.org v0.0.0-20200607064236-483084f4becd gioui.org v0.0.0-20200607143106-f710bdf8e8f1
github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7 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/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72
github.com/google/go-github/v24 v24.0.1 github.com/google/go-github/v24 v24.0.1
example/go.sum
+2 -2
View File
@@ -1,7 +1,7 @@
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= 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= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
gioui.org v0.0.0-20200607064236-483084f4becd h1:qnVH6k93cRgl8UJ2lfSPqFpz/3C8iz/hCrme6+CEBz4= gioui.org v0.0.0-20200607143106-f710bdf8e8f1 h1:mkhlEjXxmINvmSyI+MMwSJUFHFYoBd/7hPvijrO9v/w=
gioui.org v0.0.0-20200607064236-483084f4becd/go.mod h1:AHI9rFr6AEEHCb8EPVtb/p5M+NMJRKH58IOp8O3Je04= gioui.org v0.0.0-20200607143106-f710bdf8e8f1/go.mod h1:AHI9rFr6AEEHCb8EPVtb/p5M+NMJRKH58IOp8O3Je04=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= 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 h1:SCYMcCJ89LjRGwEa0tRluNRiMjZHalQZrVrvTbPh+qw=
github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7/go.mod h1:482civXOzJJCPzJ4ZOX/pwvXBWSnzD4OKMdH4ClKGbk= github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7/go.mod h1:482civXOzJJCPzJ4ZOX/pwvXBWSnzD4OKMdH4ClKGbk=
example/gophers/ui.go
+1 -2
View File
@@ -71,8 +71,7 @@ type (
) )
func init() { func init() {
gofont.Register() theme = material.NewTheme(gofont.Collection())
theme = material.NewTheme()
theme.Color.Text = rgb(0x333333) theme.Color.Text = rgb(0x333333)
theme.Color.Hint = rgb(0xbbbbbb) theme.Color.Hint = rgb(0xbbbbbb)
} }
example/hello/hello.go
+1 -2
View File
@@ -29,8 +29,7 @@ func main() {
} }
func loop(w *app.Window) error { func loop(w *app.Window) error {
gofont.Register() th := material.NewTheme(gofont.Collection())
th := material.NewTheme()
var ops op.Ops var ops op.Ops
for { for {
e := <-w.Events() e := <-w.Events()
example/kitchen/kitchen.go
+2 -3
View File
@@ -53,7 +53,6 @@ func main() {
} }
icon = ic icon = ic
progressIncrementer = make(chan int) progressIncrementer = make(chan int)
gofont.Register()
if *screenshot != "" { if *screenshot != "" {
if err := saveScreenshot(*screenshot); err != nil { if err := saveScreenshot(*screenshot); err != nil {
fmt.Fprintf(os.Stderr, "failed to save screenshot: %v\n", err) fmt.Fprintf(os.Stderr, "failed to save screenshot: %v\n", err)
@@ -90,7 +89,7 @@ func saveScreenshot(f string) error {
Config: &scaledConfig{scale}, Config: &scaledConfig{scale},
Constraints: layout.Exact(sz), Constraints: layout.Exact(sz),
} }
th := material.NewTheme() th := material.NewTheme(gofont.Collection())
kitchen(gtx, th) kitchen(gtx, th)
w.Frame(gtx.Ops) w.Frame(gtx.Ops)
img, err := w.Screenshot() img, err := w.Screenshot()
@@ -105,7 +104,7 @@ func saveScreenshot(f string) error {
} }
func loop(w *app.Window) error { func loop(w *app.Window) error {
th := material.NewTheme() th := material.NewTheme(gofont.Collection())
var ops op.Ops var ops op.Ops
for { for {
example/tabs/tabs.go
+1 -2
View File
@@ -33,8 +33,7 @@ func main() {
} }
func loop(w *app.Window) error { func loop(w *app.Window) error {
gofont.Register() th := material.NewTheme(gofont.Collection())
th := material.NewTheme()
var ops op.Ops var ops op.Ops
for { for {
e := <-w.Events() e := <-w.Events()