mirror of
https://git.sr.ht/~eliasnaur/gio
synced 2026-07-07 02:15:34 +00:00
apps: drop init funcs
Now that Gio runs main functions everywhere, init func are no longer necessary. Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
+1
-1
@@ -3,7 +3,7 @@ module gioui.org/apps
|
|||||||
go 1.12
|
go 1.12
|
||||||
|
|
||||||
require (
|
require (
|
||||||
gioui.org/ui v0.0.0-20190721200230-1ee8c08f3bf9
|
gioui.org/ui v0.0.0-20190722093309-c080a54038a6
|
||||||
github.com/google/go-github/v24 v24.0.1
|
github.com/google/go-github/v24 v24.0.1
|
||||||
golang.org/x/exp v0.0.0-20190627132806-fd42eb6b336f
|
golang.org/x/exp v0.0.0-20190627132806-fd42eb6b336f
|
||||||
golang.org/x/image v0.0.0-20190703141733-d6a02ce849c9
|
golang.org/x/image v0.0.0-20190703141733-d6a02ce849c9
|
||||||
|
|||||||
+12
-15
@@ -126,25 +126,12 @@ var theme struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
flag.Parse()
|
||||||
|
initProfiling()
|
||||||
if *token == "" {
|
if *token == "" {
|
||||||
fmt.Println("The quota for anonymous GitHub API access is very low. Specify a token with -token to avoid quota errors.")
|
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.")
|
fmt.Println("See https://help.github.com/en/articles/creating-a-personal-access-token-for-the-command-line.")
|
||||||
}
|
}
|
||||||
app.Main()
|
|
||||||
}
|
|
||||||
|
|
||||||
func initProfiling() {
|
|
||||||
if !*profile {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
go func() {
|
|
||||||
log.Println(http.ListenAndServe("localhost:6060", nil))
|
|
||||||
}()
|
|
||||||
}
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
flag.Parse()
|
|
||||||
initProfiling()
|
|
||||||
go func() {
|
go func() {
|
||||||
fonts.regular = mustLoadFont(goregular.TTF)
|
fonts.regular = mustLoadFont(goregular.TTF)
|
||||||
fonts.bold = mustLoadFont(gobold.TTF)
|
fonts.bold = mustLoadFont(gobold.TTF)
|
||||||
@@ -164,6 +151,16 @@ func init() {
|
|||||||
log.Fatal(err)
|
log.Fatal(err)
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
app.Main()
|
||||||
|
}
|
||||||
|
|
||||||
|
func initProfiling() {
|
||||||
|
if !*profile {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
go func() {
|
||||||
|
log.Println(http.ListenAndServe("localhost:6060", nil))
|
||||||
|
}()
|
||||||
}
|
}
|
||||||
|
|
||||||
func colorMaterial(ops *ui.Ops, color color.RGBA) ui.MacroOp {
|
func colorMaterial(ops *ui.Ops, color color.RGBA) ui.MacroOp {
|
||||||
|
|||||||
+1
-6
@@ -20,18 +20,13 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
app.Main()
|
|
||||||
}
|
|
||||||
|
|
||||||
// On iOS and Android main will never be called, so
|
|
||||||
// setting up the window must run in an init function.
|
|
||||||
func init() {
|
|
||||||
go func() {
|
go func() {
|
||||||
w := app.NewWindow(nil)
|
w := app.NewWindow(nil)
|
||||||
if err := loop(w); err != nil {
|
if err := loop(w); err != nil {
|
||||||
log.Fatal(err)
|
log.Fatal(err)
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
app.Main()
|
||||||
}
|
}
|
||||||
|
|
||||||
func loop(w *app.Window) error {
|
func loop(w *app.Window) error {
|
||||||
|
|||||||
Reference in New Issue
Block a user