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

ui/app,apps/gophers,apps/hello: replace CreateWindow with NewWindow

Browse Source 
Gio doesn't support multiple windows anyway, so get rid of the
app.Windows channel and use NewWindow call for the mobile platforms
as well.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-03-31 13:36:24 +02:00
parent cf258f707f
commit f21b5eb1df
10 changed files with 81 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/go.mod
+2
View File
@@ -2,6 +2,8 @@ module gioui.org/apps
go 1.12
replace gioui.org/ui => ../ui
require (
gioui.org/ui v0.0.0-20190331090026-ca5204fcb8b3
github.com/google/go-github/v24 v24.0.1
apps/go.sum
-2
View File
@@ -1,6 +1,4 @@
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
gioui.org/ui v0.0.0-20190331090026-ca5204fcb8b3 h1:+iSMCchOrM75QcNH8czjwCXVbwYLofiPeKHl/8Nxxck=
gioui.org/ui v0.0.0-20190331090026-ca5204fcb8b3/go.mod h1:FBjAd/bO8PFxAPY49SiMXkF7Mj677k+KYut4glYlhnM=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
apps/gophers/main.go
+10 -15
View File
@@ -119,14 +119,6 @@ func main() {
fmt.Println("The quota for anonymous GitHub API access is very low. Specify a token with -token to avoid quota errors.")
fmt.Println("See https://help.github.com/en/articles/creating-a-personal-access-token-for-the-command-line.")
}
err := app.CreateWindow(app.WindowOptions{
Width: ui.Dp(400),
Height: ui.Dp(800),
Title: "Gophers",
})
if err != nil {
log.Fatal(err)
}
app.Main()
}
@@ -147,13 +139,16 @@ func init() {
fonts.italic = mustLoadFont(goitalic.TTF)
fonts.mono = mustLoadFont(gomono.TTF)
go func() {
for w := range app.Windows() {
w := w
go func() {
if err := newApp(w).run(); err != nil {
log.Fatal(err)
}
}()
w, err := app.NewWindow(app.WindowOptions{
Width: ui.Dp(400),
Height: ui.Dp(800),
Title: "Gophers",
})
if err != nil {
log.Fatal(err)
}
if err := newApp(w).run(); err != nil {
log.Fatal(err)
}
}()
}
apps/hello/hello.go
+24 -30
View File
@@ -18,26 +18,10 @@ import (
)
func main() {
err := app.CreateWindow(app.WindowOptions{
Width: ui.Dp(400),
Height: ui.Dp(800),
Title: "Hello World",
})
if err != nil {
log.Fatal(err)
}
app.Main()
}
func init() {
go func() {
for w := range app.Windows() {
go loop(w)
}
}()
}
func loop(w *app.Window) {
regular, err := sfnt.Parse(goregular.TTF)
if err != nil {
panic("failed to load font")
@@ -45,19 +29,29 @@ func loop(w *app.Window) {
var faces measure.Faces
black := &image.Uniform{color.Black}
face := faces.For(regular, ui.Dp(50))
for w.IsAlive() {
e := <-w.Events()
switch e := e.(type) {
case app.Draw:
faces.Cfg = e.Config
cs := layout.ExactConstraints(w.Size())
root, _ := (text.Label{Src: black, Face: face, Text: "Hello, World!"}).Layout(cs)
w.Draw(root)
faces.Frame()
go func() {
w, err := app.NewWindow(app.WindowOptions{
Width: ui.Dp(400),
Height: ui.Dp(800),
Title: "Hello World",
})
if err != nil {
log.Fatal(err)
}
w.Ack()
}
if w.Err() != nil {
log.Fatal(err)
}
for w.IsAlive() {
e := <-w.Events()
switch e := e.(type) {
case app.Draw:
faces.Cfg = e.Config
cs := layout.ExactConstraints(w.Size())
root, _ := (text.Label{Src: black, Face: face, Text: "Hello, World!"}).Layout(cs)
w.Draw(root)
faces.Frame()
}
w.Ack()
}
if w.Err() != nil {
log.Fatal(err)
}
}()
}