apps: update to new NewWindow API

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-07-12 20:04:02 +02:00
parent a3b9c7818f
commit 8e307b40a6
3 changed files with 18 additions and 27 deletions
+1 -1
View File
@@ -3,7 +3,7 @@ module gioui.org/apps
go 1.12
require (
gioui.org/ui v0.0.0-20190712135441-2296393471ae
gioui.org/ui v0.0.0-20190712184729-a3b9c7818fa7
github.com/google/go-github/v24 v24.0.1
golang.org/x/exp v0.0.0-20190627132806-fd42eb6b336f
golang.org/x/image v0.0.0-20190703141733-d6a02ce849c9
+10 -15
View File
@@ -137,14 +137,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()
}
@@ -169,14 +161,17 @@ func init() {
theme.tertText = colorMaterial(&ops, rgb(0xbbbbbb))
theme.brand = colorMaterial(&ops, rgb(0x62798c))
theme.white = colorMaterial(&ops, rgb(0xffffff))
w, err := app.NewWindow(&app.WindowOptions{
Width: ui.Dp(400),
Height: ui.Dp(800),
Title: "Gophers",
})
if err != nil {
log.Fatal(err)
}
go func() {
for w := range app.Windows() {
w := w
go func() {
if err := newApp(w).run(); err != nil {
log.Fatal(err)
}
}()
if err := newApp(w).run(); err != nil {
log.Fatal(err)
}
}()
}
+7 -11
View File
@@ -20,24 +20,20 @@ import (
)
func main() {
wopt := app.WindowOptions{Width: ui.Px(612), Height: ui.Px(792), Title: "Hello"}
if err := app.CreateWindow(&wopt); err != nil {
log.Fatal(err)
}
app.Main()
}
// On iOS and Android main will never be called, so
// setting up the window must run in an init function.
func init() {
wopt := app.WindowOptions{Width: ui.Dp(800), Height: ui.Dp(600), Title: "Hello"}
w, err := app.NewWindow(&wopt)
if err != nil {
log.Fatal(err)
}
go func() {
for w := range app.Windows() {
w := w
go func() {
if err := loop(w); err != nil {
log.Fatal(err)
}
}()
if err := loop(w); err != nil {
log.Fatal(err)
}
}()
}