diff --git a/go.mod b/go.mod index d01b4127..ff7fce94 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module fyshos.com/fynedesk go 1.19 require ( - fyne.io/fyne/v2 v2.5.1-0.20240723013128-bbfc67312e64 + fyne.io/fyne/v2 v2.5.1-0.20240815191931-e5989189e655 github.com/BurntSushi/xgb v0.0.0-20201008132610-5f9e7b3c49cd github.com/BurntSushi/xgbutil v0.0.0-20160919175755-f7c97cef3b4e github.com/FyshOS/backgrounds v0.0.0-20230616202904-0a8b6ebaa184 @@ -40,7 +40,7 @@ require ( github.com/fyne-io/terminal v0.0.0-20240728203942-56c3b98b9208 github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6 // indirect github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a // indirect - github.com/go-text/render v0.1.0 // indirect + github.com/go-text/render v0.1.1-0.20240418202334-dd62631dae9b // indirect github.com/go-text/typesetting v0.1.0 // indirect github.com/gopherjs/gopherjs v1.17.2 // indirect github.com/jsummers/gobmp v0.0.0-20151104160322-e2ba15ffa76e // indirect @@ -53,7 +53,7 @@ require ( golang.org/x/mobile v0.0.0-20231127183840-76ac6878050a // indirect golang.org/x/net v0.25.0 // indirect golang.org/x/sys v0.20.0 // indirect - golang.org/x/text v0.16.0 // indirect + golang.org/x/text v0.16.0 gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index df80b17d..97aaef1c 100644 --- a/go.sum +++ b/go.sum @@ -37,8 +37,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -fyne.io/fyne/v2 v2.5.1-0.20240723013128-bbfc67312e64 h1:AR8iFr+DKB3O7M17Mrmd89N/Dv0R4qzM6nX36kKDHMA= -fyne.io/fyne/v2 v2.5.1-0.20240723013128-bbfc67312e64/go.mod h1:9D4oT3NWeG+MLi/lP7ItZZyujHC/qqMJpoGTAYX5Uqc= +fyne.io/fyne/v2 v2.5.1-0.20240815191931-e5989189e655 h1:o+g1Yb0fzLJGFqy1lgf5KbRoy+6Ww1pLzYpwsoEHnbw= +fyne.io/fyne/v2 v2.5.1-0.20240815191931-e5989189e655/go.mod h1:FJqxIqtPduJbHOSHnLVQtHoTiuO34+IvRL9EkKdlaxs= fyne.io/systray v1.11.0 h1:D9HISlxSkx+jHSniMBR6fCFOUjk1x/OOOJLa9lJYAKg= fyne.io/systray v1.11.0/go.mod h1:RVwqP9nYMo7h5zViCBHri2FgjXF7H2cub7MAq4NSoLs= github.com/ActiveState/termtest/conpty v0.5.0 h1:JLUe6YDs4Jw4xNPCU+8VwTpniYOGeKzQg4SM2YHQNA8= @@ -116,8 +116,8 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a h1:vxnBhFDDT+xzxf1jTJKMKZw3H0swfWk9RpWbBbDK5+0= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-text/render v0.1.0 h1:osrmVDZNHuP1RSu3pNG7Z77Sd2xSbcb/xWytAj9kyVs= -github.com/go-text/render v0.1.0/go.mod h1:jqEuNMenrmj6QRnkdpeaP0oKGFLDNhDkVKwGjsWWYU4= +github.com/go-text/render v0.1.1-0.20240418202334-dd62631dae9b h1:daoFn+Aw8EIQZO9kYWwHL01FqwwpCl2nTeVEYbsgRHk= +github.com/go-text/render v0.1.1-0.20240418202334-dd62631dae9b/go.mod h1:jqEuNMenrmj6QRnkdpeaP0oKGFLDNhDkVKwGjsWWYU4= github.com/go-text/typesetting v0.1.0 h1:vioSaLPYcHwPEPLT7gsjCGDCoYSbljxoHJzMnKwVvHw= github.com/go-text/typesetting v0.1.0/go.mod h1:d22AnmeKq/on0HNv73UFriMKc4Ez6EqZAofLhAzpSzI= github.com/go-text/typesetting-utils v0.0.0-20240329101916-eee87fb235a3 h1:levTnuLLUmpavLGbJYLJA7fQnKeS7P1eCdAlM+vReXk= diff --git a/modules/status/testdata/battery_25.png b/modules/status/testdata/battery_25.png index 4644e5f0..1d995ba3 100644 Binary files a/modules/status/testdata/battery_25.png and b/modules/status/testdata/battery_25.png differ diff --git a/modules/status/testdata/battery_50.png b/modules/status/testdata/battery_50.png index 92560596..d43425ac 100644 Binary files a/modules/status/testdata/battery_50.png and b/modules/status/testdata/battery_50.png differ diff --git a/modules/status/testdata/battery_full.png b/modules/status/testdata/battery_full.png index 2261e32b..63857736 100644 Binary files a/modules/status/testdata/battery_full.png and b/modules/status/testdata/battery_full.png differ diff --git a/modules/status/testdata/battery_low.png b/modules/status/testdata/battery_low.png index 9fc89532..7050c85c 100644 Binary files a/modules/status/testdata/battery_low.png and b/modules/status/testdata/battery_low.png differ diff --git a/wm/util_test.go b/wm/util_test.go index f9e3be77..7b7efa52 100644 --- a/wm/util_test.go +++ b/wm/util_test.go @@ -7,11 +7,12 @@ import ( "fyne.io/fyne/v2/container" "fyne.io/fyne/v2/test" "fyne.io/fyne/v2/widget" + "github.com/stretchr/testify/assert" ) func TestFindObjectAtPixelPositionMatching(t *testing.T) { - l := widget.NewLabel("Test") + l := widget.NewRichTextFromMarkdown("* Test") e := widget.NewEntry() w := test.NewWindow( container.NewGridWithColumns(1, l, e))