Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
  • Loading branch information
andydotxyz committed Jul 10, 2024
2 parents ad04a6f + d8e9fe0 commit 04746cc
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github: [fyne-io, andydotxyz, toaster, Jacalz, changkun]
github: [fyne-io, andydotxyz, toaster, Jacalz, changkun, dweymouth, lucor]
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

<div align="center">
Expand Down
2 changes: 1 addition & 1 deletion theme/icons_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,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(theme.DarkTheme())
staticResource := helperLoadRes(t, "cancel_PathsBlackFill.svg")
Expand Down

0 comments on commit 04746cc

Please sign in to comment.