From fce4b1f58b69533803f26b6f909062f9e9aaf726 Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Tue, 30 Jun 2020 11:28:43 +0100 Subject: [PATCH] Converge on a better cross-platform hello app --- cmd/hello/main.go | 12 ++++++------ fyne.go | 12 +++++++----- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/cmd/hello/main.go b/cmd/hello/main.go index f5fa5a289c..9339418d4a 100644 --- a/cmd/hello/main.go +++ b/cmd/hello/main.go @@ -2,20 +2,20 @@ package main import ( - "net/url" - "fyne.io/fyne/app" "fyne.io/fyne/widget" ) func main() { a := app.New() - tourURL, _ := url.Parse("https://tour.fyne.io") - w := a.NewWindow("Hello") + + hello := widget.NewLabel("Hello Fyne!") w.SetContent(widget.NewVBox( - widget.NewLabel("Hello Fyne!"), - widget.NewHyperlink("tour.fyne.io", tourURL), + hello, + widget.NewButton("Hi!", func() { + hello.SetText("Welcome :)") + }), )) w.ShowAndRun() diff --git a/fyne.go b/fyne.go index a2bae229ae..0fc4ab6b5a 100644 --- a/fyne.go +++ b/fyne.go @@ -12,13 +12,15 @@ // // func main() { // a := app.New() -// // w := a.NewWindow("Hello") +// +// hello := widget.NewLabel("Hello Fyne!") // w.SetContent(widget.NewVBox( -// widget.NewLabel("Hello Fyne!"), -// widget.NewButton("Quit", func() { -// a.Quit() -// }))) +// hello, +// widget.NewButton("Hi!", func() { +// hello.SetText("Welcome :)") +// }), +// )) // // w.ShowAndRun() // }