From a3791b599b084b3c34685ff095b3c8f79a69e405 Mon Sep 17 00:00:00 2001 From: grngxd <36968271+grngxd@users.noreply.github.com> Date: Fri, 27 Jun 2025 15:23:51 +0100 Subject: [PATCH 1/2] make fn optional in app.Run --- README.md | 2 +- examples/minimal/index.html | 6 ++++++ examples/minimal/main.go | 24 ++++++++++++++++++++++++ tiramisu.go | 8 +++++--- 4 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 examples/minimal/index.html create mode 100644 examples/minimal/main.go diff --git a/README.md b/README.md index df9a27b..7ecd4db 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ import ( func main() { // create the webview instance - app := tiramisu.New(tiramisu.Options{ + app := tiramisu.New(tiramisu.TiramisuOptions{ Title: "Tiramisu Example", Width: 800, Height: 600, diff --git a/examples/minimal/index.html b/examples/minimal/index.html new file mode 100644 index 0000000..e1fd12b --- /dev/null +++ b/examples/minimal/index.html @@ -0,0 +1,6 @@ + + + +

hello tiramisu!

+ + \ No newline at end of file diff --git a/examples/minimal/main.go b/examples/minimal/main.go new file mode 100644 index 0000000..fb114b0 --- /dev/null +++ b/examples/minimal/main.go @@ -0,0 +1,24 @@ +package main + +import ( + _ "embed" + + t "git.iwakura.rip/grng/tiramisu" + webview "github.com/webview/webview_go" +) + +//go:embed index.html +var html string + +func main() { + app := t.New(t.TiramisuOptions{ + Debug: true, + Width: 800, + Height: 600, + Title: "Tiramisu", + Hints: webview.HintFixed, + }) + + app.HTML(html) + app.Run() +} diff --git a/tiramisu.go b/tiramisu.go index 3292cc5..7d46ece 100644 --- a/tiramisu.go +++ b/tiramisu.go @@ -40,14 +40,16 @@ func New(o TiramisuOptions) *Tiramisu { return t } -func (t *Tiramisu) Run(fn func()) { +func (t *Tiramisu) Run(fns ...func()) { defer t.w.Destroy() t.w.Dispatch(func() { t.loadJSRuntime() t.loadGoRuntime() - if fn != nil { - fn() + for _, fn := range fns { + if fn != nil { + fn() + } } }) t.w.Run() From c95bafd34fbb51779d13da1aab0f2026c9f0c4fc Mon Sep 17 00:00:00 2001 From: grngxd <36968271+grngxd@users.noreply.github.com> Date: Fri, 27 Jun 2025 15:26:32 +0100 Subject: [PATCH 2/2] forgot navigate --- README.md | 2 +- tiramisu.go | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7ecd4db..4833a3f 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Build modern, cross-platform desktop apps in HTML + Go from one codebase. It use - ⚡**Fast development**: Use *ANY* web framework for your UI. Tiramisu handles all the magic of making it work, for you. ## Installation -`go install git.iwakura.rip/grng/tiramisu` +`go get -u git.iwakura.rip/grng/tiramisu` ## Example diff --git a/tiramisu.go b/tiramisu.go index 7d46ece..e51a7b1 100644 --- a/tiramisu.go +++ b/tiramisu.go @@ -97,6 +97,12 @@ func (t *Tiramisu) HTML(html string) { t.loadGoRuntime() } +func (t *Tiramisu) Navigate(url string) { + t.w.Navigate(url) + t.loadJSRuntime() + t.loadGoRuntime() +} + //go:embed runtime/out/* var runtimeFS embed.FS