mirror of
https://git.sr.ht/~eliasnaur/gio
synced 2026-07-06 09:55:40 +00:00
example,cmd: bump gio version
Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
+1
-1
@@ -3,7 +3,7 @@ module gioui.org/cmd
|
|||||||
go 1.13
|
go 1.13
|
||||||
|
|
||||||
require (
|
require (
|
||||||
gioui.org v0.0.0-20200523202849-2451750782b8
|
gioui.org v0.0.0-20200524112000-4898e1a6914b
|
||||||
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
|
||||||
|
|||||||
+2
-2
@@ -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-20200523202849-2451750782b8 h1:TB+F3jDAVjNemdtgc8yfvsPy1xWkyn7JLOsm5r+YUuQ=
|
gioui.org v0.0.0-20200524112000-4898e1a6914b h1:QlWcMLav7UWzEst7829ntKvNwNN1fPXR38BwndoZQxg=
|
||||||
gioui.org v0.0.0-20200523202849-2451750782b8/go.mod h1:AHI9rFr6AEEHCb8EPVtb/p5M+NMJRKH58IOp8O3Je04=
|
gioui.org v0.0.0-20200524112000-4898e1a6914b/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=
|
||||||
|
|||||||
+1
-1
@@ -3,7 +3,7 @@ module gioui.org/example
|
|||||||
go 1.13
|
go 1.13
|
||||||
|
|
||||||
require (
|
require (
|
||||||
gioui.org v0.0.0-20200523202849-2451750782b8
|
gioui.org v0.0.0-20200524112000-4898e1a6914b
|
||||||
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
|
||||||
|
|||||||
+2
-2
@@ -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-20200523202849-2451750782b8 h1:TB+F3jDAVjNemdtgc8yfvsPy1xWkyn7JLOsm5r+YUuQ=
|
gioui.org v0.0.0-20200524112000-4898e1a6914b h1:QlWcMLav7UWzEst7829ntKvNwNN1fPXR38BwndoZQxg=
|
||||||
gioui.org v0.0.0-20200523202849-2451750782b8/go.mod h1:AHI9rFr6AEEHCb8EPVtb/p5M+NMJRKH58IOp8O3Je04=
|
gioui.org v0.0.0-20200524112000-4898e1a6914b/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=
|
||||||
|
|||||||
@@ -242,7 +242,7 @@ func (u *UI) layoutUsers(gtx layout.Context) {
|
|||||||
layout.Stacked(func(gtx C) D {
|
layout.Stacked(func(gtx C) D {
|
||||||
in := layout.UniformInset(unit.Dp(16))
|
in := layout.UniformInset(unit.Dp(16))
|
||||||
return in.Layout(gtx, func(gtx C) D {
|
return in.Layout(gtx, func(gtx C) D {
|
||||||
for u.fab.Clicked(gtx) {
|
for u.fab.Clicked() {
|
||||||
}
|
}
|
||||||
return material.IconButton(theme, u.fab, u.fabIcon).Layout(gtx)
|
return material.IconButton(theme, u.fab, u.fabIcon).Layout(gtx)
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -118,10 +118,10 @@ func loop(w *app.Window) error {
|
|||||||
return e.Err
|
return e.Err
|
||||||
case system.FrameEvent:
|
case system.FrameEvent:
|
||||||
gtx := layout.NewContext(&ops, e.Queue, e.Config, e.Size)
|
gtx := layout.NewContext(&ops, e.Queue, e.Config, e.Size)
|
||||||
for iconButton.Clicked(gtx) {
|
for iconButton.Clicked() {
|
||||||
w.WriteClipboard(lineEditor.Text())
|
w.WriteClipboard(lineEditor.Text())
|
||||||
}
|
}
|
||||||
for flatBtn.Clicked(gtx) {
|
for flatBtn.Clicked() {
|
||||||
w.ReadClipboard()
|
w.ReadClipboard()
|
||||||
}
|
}
|
||||||
kitchen(gtx, th)
|
kitchen(gtx, th)
|
||||||
@@ -198,6 +198,12 @@ func (b iconAndTextButton) Layout(gtx layout.Context) layout.Dimensions {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func kitchen(gtx layout.Context, th *material.Theme) layout.Dimensions {
|
func kitchen(gtx layout.Context, th *material.Theme) layout.Dimensions {
|
||||||
|
for _, e := range lineEditor.Events() {
|
||||||
|
if e, ok := e.(widget.SubmitEvent); ok {
|
||||||
|
topLabel = e.Text
|
||||||
|
lineEditor.SetText("")
|
||||||
|
}
|
||||||
|
}
|
||||||
widgets := []layout.Widget{
|
widgets := []layout.Widget{
|
||||||
material.H3(th, topLabel).Layout,
|
material.H3(th, topLabel).Layout,
|
||||||
func(gtx C) D {
|
func(gtx C) D {
|
||||||
@@ -205,12 +211,6 @@ func kitchen(gtx layout.Context, th *material.Theme) layout.Dimensions {
|
|||||||
return material.Editor(th, editor, "Hint").Layout(gtx)
|
return material.Editor(th, editor, "Hint").Layout(gtx)
|
||||||
},
|
},
|
||||||
func(gtx C) D {
|
func(gtx C) D {
|
||||||
for _, e := range lineEditor.Events(gtx) {
|
|
||||||
if e, ok := e.(widget.SubmitEvent); ok {
|
|
||||||
topLabel = e.Text
|
|
||||||
lineEditor.SetText("")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
e := material.Editor(th, lineEditor, "Hint")
|
e := material.Editor(th, lineEditor, "Hint")
|
||||||
e.Font.Style = text.Italic
|
e.Font.Style = text.Italic
|
||||||
return e.Layout(gtx)
|
return e.Layout(gtx)
|
||||||
@@ -226,7 +226,7 @@ func kitchen(gtx layout.Context, th *material.Theme) layout.Dimensions {
|
|||||||
}),
|
}),
|
||||||
layout.Rigid(func(gtx C) D {
|
layout.Rigid(func(gtx C) D {
|
||||||
return in.Layout(gtx, func(gtx C) D {
|
return in.Layout(gtx, func(gtx C) D {
|
||||||
for button.Clicked(gtx) {
|
for button.Clicked() {
|
||||||
green = !green
|
green = !green
|
||||||
}
|
}
|
||||||
return material.Button(th, button, "Click me!").Layout(gtx)
|
return material.Button(th, button, "Click me!").Layout(gtx)
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ func drawTabs(gtx layout.Context, th *material.Theme) layout.Dimensions {
|
|||||||
layout.Rigid(func(gtx C) D {
|
layout.Rigid(func(gtx C) D {
|
||||||
return tabs.list.Layout(gtx, len(tabs.tabs), func(gtx C, tabIdx int) D {
|
return tabs.list.Layout(gtx, len(tabs.tabs), func(gtx C, tabIdx int) D {
|
||||||
t := &tabs.tabs[tabIdx]
|
t := &tabs.tabs[tabIdx]
|
||||||
if t.btn.Clicked(gtx) {
|
if t.btn.Clicked() {
|
||||||
if tabs.selected < tabIdx {
|
if tabs.selected < tabIdx {
|
||||||
slider.PushLeft()
|
slider.PushLeft()
|
||||||
} else if tabs.selected > tabIdx {
|
} else if tabs.selected > tabIdx {
|
||||||
|
|||||||
Reference in New Issue
Block a user