From 8955049bd210f580b9c0cc0c2c0b3b165183a5b1 Mon Sep 17 00:00:00 2001 From: Drew Weymouth Date: Wed, 8 Nov 2023 08:42:51 -0800 Subject: [PATCH 1/5] add myself to github sponsors --- .github/FUNDING.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 3eaff5b70d..20db0f4412 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1 +1 @@ -github: [fyne-io, andydotxyz, toaster, Jacalz, changkun] +github: [fyne-io, andydotxyz, toaster, Jacalz, changkun, dweymouth] From a09bbd790b98120bc406a064f80aeafb4ca97656 Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Sun, 24 Dec 2023 12:49:04 +0000 Subject: [PATCH 2/5] Fix merge glitch --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 13e016b4f2..0c2231c0ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,6 @@ This file lists the main changes with each version of the Fyne toolkit. More detailed release notes can be found on the [releases page](https://github.com/fyne-io/fyne/releases). -<<<<<<< HEAD ## 2.4.3 - 23 December 2023 ### Fixed From 0ace38672951e9e2879334aa058878e2c0f63233 Mon Sep 17 00:00:00 2001 From: Luca Corbo Date: Tue, 30 Jan 2024 19:33:19 +0100 Subject: [PATCH 3/5] add myself to github sponsors --- .github/FUNDING.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 20db0f4412..779eb235a9 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1 +1 @@ -github: [fyne-io, andydotxyz, toaster, Jacalz, changkun, dweymouth] +github: [fyne-io, andydotxyz, toaster, Jacalz, changkun, dweymouth, lucor] From 3e962371ecd06552d00a31a125c8d508f266c2b7 Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Tue, 26 Mar 2024 13:15:16 +0000 Subject: [PATCH 4/5] Add the slow warning from lostdusty --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index a7e456a083..67582641d0 100644 --- a/README.md +++ b/README.md @@ -97,6 +97,9 @@ And you can run that simply as: go run main.go +> [!NOTE] +> The first compilation of Fyne on Windows _can_ take up to 10 minutes, depending on your hardware. Subsequent builds will be fast. + It should look like this:
From 6b2c99e1a3a79e7463a3083350070fc0c583f412 Mon Sep 17 00:00:00 2001 From: xiaoxiangxianzi Date: Wed, 27 Mar 2024 23:45:17 +0800 Subject: [PATCH 5/5] chore: remove repetitive words in comments Signed-off-by: xiaoxiangxianzi --- internal/app/lifecycle.go | 2 +- internal/cache/base.go | 2 +- internal/repository/http.go | 2 +- storage/filter.go | 2 +- theme/icons_test.go | 2 +- widget/check.go | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/app/lifecycle.go b/internal/app/lifecycle.go index b8b6fe70a9..15a7dd0c2f 100644 --- a/internal/app/lifecycle.go +++ b/internal/app/lifecycle.go @@ -26,7 +26,7 @@ func (l *Lifecycle) SetOnStoppedHookExecuted(f func()) { l.onStoppedHookExecuted = f } -// SetOnEnteredForeground hooks into the the app becoming foreground. +// SetOnEnteredForeground hooks into the app becoming foreground. func (l *Lifecycle) SetOnEnteredForeground(f func()) { l.onForeground.Store(f) } diff --git a/internal/cache/base.go b/internal/cache/base.go index 422a08503d..e0f71835ce 100644 --- a/internal/cache/base.go +++ b/internal/cache/base.go @@ -202,7 +202,7 @@ func destroyExpiredRenderers(now time.Time) { } // matchesACanvas returns true if the canvas represented by the canvasInfo object matches one of -// the canvases passed in in 'canvases', otherwise false is returned. +// the canvases passed in 'canvases', otherwise false is returned. func matchesACanvas(cinfo *canvasInfo, canvases []fyne.Canvas) bool { canvas := cinfo.canvas diff --git a/internal/repository/http.go b/internal/repository/http.go index ffce5f10ff..6297f0edbf 100644 --- a/internal/repository/http.go +++ b/internal/repository/http.go @@ -67,7 +67,7 @@ func constructURI(u fyne.URI) string { return uri } -// Exists checks whether the the resource at u returns a +// Exists checks whether the resource at u returns a // non "404 NOT FOUND" response header. // // Implements: repository.Repository diff --git a/storage/filter.go b/storage/filter.go index bcc9adac05..caf5c449c3 100644 --- a/storage/filter.go +++ b/storage/filter.go @@ -12,7 +12,7 @@ type FileFilter interface { Matches(fyne.URI) bool } -// ExtensionFileFilter represents a file filter based on the the ending of file names, +// ExtensionFileFilter represents a file filter based on the ending of file names, // for example ".txt" and ".png". type ExtensionFileFilter struct { Extensions []string diff --git a/theme/icons_test.go b/theme/icons_test.go index 162d3e72bd..85a60e4e6c 100644 --- a/theme/icons_test.go +++ b/theme/icons_test.go @@ -131,7 +131,7 @@ func TestThemedResource_Content_GroupPolygonsFile(t *testing.T) { assert.NotEqual(t, staticResource.Content(), themedResource.Content()) } -// a black svg object omits the fill tag, this checks it it still properly updated +// a black svg object omits the fill tag, this checks if it still properly updated func TestThemedResource_Content_BlackFillIsUpdated(t *testing.T) { fyne.CurrentApp().Settings().SetTheme(DarkTheme()) staticResource := helperLoadRes(t, "cancel_PathsBlackFill.svg") diff --git a/widget/check.go b/widget/check.go index ee50f80056..75a045a271 100644 --- a/widget/check.go +++ b/widget/check.go @@ -63,7 +63,7 @@ func (c *Check) Bind(data binding.Bool) { } } -// SetChecked sets the the checked state and refreshes widget +// SetChecked sets the checked state and refreshes widget func (c *Check) SetChecked(checked bool) { if checked == c.Checked { return