summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxengineering <me@xengineering.eu>2023-09-04 17:28:40 +0200
committerxengineering <me@xengineering.eu>2023-09-04 17:28:40 +0200
commit44bc88197196df41ead0ede734295cb2feac066d (patch)
tree4adad576e38e4c15e97e524020f2124aa615a39b
parent16d5f079cc51bffe9f07b356f3a42d5a09a45317 (diff)
parent8ec8cddbdce0add6c62de0370b32362f7e7bb384 (diff)
downloadlimox-main.tar
limox-main.tar.zst
limox-main.zip
Merge branch 'update'HEADmain
This updates from gioui.org v0.1.0 to v0.3.0.
-rw-r--r--go.mod4
-rw-r--r--go.sum22
-rw-r--r--limox.go3
3 files changed, 8 insertions, 21 deletions
diff --git a/go.mod b/go.mod
index dcaeebe..81e3a63 100644
--- a/go.mod
+++ b/go.mod
@@ -2,12 +2,12 @@ module xengineering.eu/limox
go 1.20
-require gioui.org v0.1.0
+require gioui.org v0.3.0
require (
gioui.org/cpu v0.0.0-20220412190645-f1e9e8c3b1f7 // indirect
gioui.org/shader v1.0.6 // indirect
- github.com/go-text/typesetting v0.0.0-20230602202114-9797aefac433 // indirect
+ github.com/go-text/typesetting v0.0.0-20230803102845-24e03d8b5372 // indirect
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect
golang.org/x/exp/shiny v0.0.0-20230522175609-2e198f4a06a1 // indirect
golang.org/x/image v0.7.0 // indirect
diff --git a/go.sum b/go.sum
index 0c8fd92..c1587de 100644
--- a/go.sum
+++ b/go.sum
@@ -1,31 +1,19 @@
eliasnaur.com/font v0.0.0-20230308162249-dd43949cb42d h1:ARo7NCVvN2NdhLlJE9xAbKweuI9L6UgfTbYb0YwPacY=
-gioui.org v0.0.0-20230502183330-59695984e53c h1:E1LyGRvMkQHZJVuVuaEW0194ANJkYEl/N9Pwj1cIMwo=
-gioui.org v0.0.0-20230502183330-59695984e53c/go.mod h1:8CFQM/4LurRd9G3NUYdacFb9j2pK0LrAyVO2mAZo4mw=
-gioui.org v0.0.0-20230512135434-8571b25ff7cb h1:a7T/STePLLA4tpx3AuBpAP7wr2PeXywiKj3aRjxnd6Y=
-gioui.org v0.0.0-20230512135434-8571b25ff7cb/go.mod h1:8CFQM/4LurRd9G3NUYdacFb9j2pK0LrAyVO2mAZo4mw=
-gioui.org v0.1.0 h1:fEDY5A4+epOdzjCBYSUC4BzvjWqsjfqf5D6mskbthOs=
-gioui.org v0.1.0/go.mod h1:a3hz8FyrPMkt899D9YrxMGtyRzpPrJpz1Lzbssn81vI=
+gioui.org v0.3.0 h1:xZty/uLl1+/HNKpumX60JPQd46n8Zy6lc5T3IRMKoR4=
+gioui.org v0.3.0/go.mod h1:1H72sKEk/fNFV+l0JNeM2Dt3co3Y4uaQcD+I+/GQ0e4=
gioui.org/cpu v0.0.0-20210808092351-bfe733dd3334/go.mod h1:A8M0Cn5o+vY5LTMlnRoK3O5kG+rH0kWfJjeKd9QpBmQ=
gioui.org/cpu v0.0.0-20220412190645-f1e9e8c3b1f7 h1:tNJdnP5CgM39PRc+KWmBRRYX/zJ+rd5XaYxY5d5veqA=
gioui.org/cpu v0.0.0-20220412190645-f1e9e8c3b1f7/go.mod h1:A8M0Cn5o+vY5LTMlnRoK3O5kG+rH0kWfJjeKd9QpBmQ=
gioui.org/shader v1.0.6 h1:cvZmU+eODFR2545X+/8XucgZdTtEjR3QWW6W65b0q5Y=
gioui.org/shader v1.0.6/go.mod h1:mWdiME581d/kV7/iEhLmUgUK5iZ09XR5XpduXzbePVM=
-github.com/go-text/typesetting v0.0.0-20230504123538-7c21ee424d89 h1:D7400Dg33HTbgG8cWMgoKEesN9gb/faWMAbLmPg+Z8g=
-github.com/go-text/typesetting v0.0.0-20230504123538-7c21ee424d89/go.mod h1:KmrpWuSMFcO2yjmyhGpnBGQHSKAoEgMTSSzvLDzCuEA=
-github.com/go-text/typesetting v0.0.0-20230520134535-86265021ae8e h1:1rvOqtQtVUNSUwGRAw/UbqpKLJ8Br/zudTwdYWn/rfg=
-github.com/go-text/typesetting v0.0.0-20230520134535-86265021ae8e/go.mod h1:KmrpWuSMFcO2yjmyhGpnBGQHSKAoEgMTSSzvLDzCuEA=
-github.com/go-text/typesetting v0.0.0-20230602202114-9797aefac433 h1:Pdyvqsfi1QYgFfZa4R8otBOtgO+CGyBDMEG8cM3jwvE=
-github.com/go-text/typesetting v0.0.0-20230602202114-9797aefac433/go.mod h1:KmrpWuSMFcO2yjmyhGpnBGQHSKAoEgMTSSzvLDzCuEA=
-github.com/go-text/typesetting-utils v0.0.0-20230412163830-89e4bcfa3ecc h1:9Kf84pnrmmjdRzZIkomfjowmGUhHs20jkrWYw/I6CYc=
+github.com/go-text/typesetting v0.0.0-20230803102845-24e03d8b5372 h1:FQivqchis6bE2/9uF70M2gmmLpe82esEm2QadL0TEJo=
+github.com/go-text/typesetting v0.0.0-20230803102845-24e03d8b5372/go.mod h1:evDBbvNR/KaVFZ2ZlDSOWWXIUKq0wCOEtzLxRM8SG3k=
+github.com/go-text/typesetting-utils v0.0.0-20230616150549-2a7df14b6a22 h1:LBQTFxP2MfsyEDqSKmUBZaDuDHN1vpqDyOZjcqS7MYI=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53 h1:5llv2sWeaMSnA3w2kS57ouQQ4pudlXrR0dCgw51QK9o=
-golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc=
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
-golang.org/x/exp/shiny v0.0.0-20230425010034-47ecfdc1ba53 h1:sF0Ip2V6Qkmm6XD01YbQQxqTj3FRjStwRmm8XQq8Hek=
-golang.org/x/exp/shiny v0.0.0-20230425010034-47ecfdc1ba53/go.mod h1:UH99kUObWAZkDnWqppdQe5ZhPYESUw8I0zVV1uWBR+0=
golang.org/x/exp/shiny v0.0.0-20230522175609-2e198f4a06a1 h1:NxHSRPlbeyFGDc6rU7YsvxV/4bXS9XhuvUt5pP63XUs=
golang.org/x/exp/shiny v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:UH99kUObWAZkDnWqppdQe5ZhPYESUw8I0zVV1uWBR+0=
golang.org/x/image v0.7.0 h1:gzS29xtG1J5ybQlv0PuyfE3nmc6R4qB73m6LUUmvFuw=
diff --git a/limox.go b/limox.go
index 5bb2d57..0b5c2ac 100644
--- a/limox.go
+++ b/limox.go
@@ -4,7 +4,6 @@ import (
"log"
"gioui.org/app"
- "gioui.org/font/gofont"
"gioui.org/io/system"
"gioui.org/op"
"gioui.org/unit"
@@ -41,7 +40,7 @@ func NewLimox() Limox {
app.Size(unit.Dp(400), unit.Dp(600)),
),
Operations: op.Ops{},
- Theme: material.NewTheme(gofont.Collection()),
+ Theme: material.NewTheme(),
sessionOut: make(chan any),
State: Disconnected,
}