Skip to content

Commit a839a7b

Browse files
xaionaroxaionaro
committed
Revert fyne version back to 2.5.4
1 parent 474991d commit a839a7b

File tree

6 files changed

+21
-33
lines changed

6 files changed

+21
-33
lines changed

‎cmd/streampanel/FyneApp.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ Website = "https://github.com/xaionaro/streamctl"
55
Name = "streampanel"
66
ID = "center.dx.streampanel"
77
Version = "0.1.0"
8-
Build = 418
8+
Build = 422

‎go.mod‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ require (
8686
github.com/fyne-io/gl-js v0.1.0 // indirect
8787
github.com/fyne-io/glfw-js v0.2.0 // indirect
8888
github.com/fyne-io/image v0.1.1 // indirect
89-
github.com/fyne-io/oksvg v0.1.0 // indirect
9089
github.com/gabriel-vasile/mimetype v1.4.7 // indirect
9190
github.com/gen2brain/shm v0.0.0-20230802011745-f2460f5984f7 // indirect
9291
github.com/getkin/kin-openapi v0.118.0 // indirect
@@ -127,8 +126,6 @@ require (
127126
github.com/gookit/color v1.5.4 // indirect
128127
github.com/goph/emperror v0.17.2 // indirect
129128
github.com/gorilla/websocket v1.5.3 // indirect
130-
github.com/hack-pad/go-indexeddb v0.3.2 // indirect
131-
github.com/hack-pad/safejs v0.1.0 // indirect
132129
github.com/hashicorp/errwrap v1.1.0 // indirect
133130
github.com/hashicorp/logutils v1.0.0 // indirect
134131
github.com/huandu/go-tls v1.0.1 // indirect
@@ -233,6 +230,7 @@ require (
233230
golang.org/x/arch v0.12.0 // indirect
234231
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
235232
golang.org/x/image v0.24.0 // indirect
233+
golang.org/x/mobile v0.0.0-20240404231514-09dbf07665ed // indirect
236234
golang.org/x/net v0.39.0 // indirect
237235
golang.org/x/sync v0.14.0 // indirect
238236
golang.org/x/sys v0.33.0 // indirect
@@ -248,7 +246,7 @@ require (
248246
)
249247

250248
require (
251-
fyne.io/fyne/v2 v2.6.1
249+
fyne.io/fyne/v2 v2.5.4
252250
github.com/AgustinSRG/go-child-process-manager v1.0.1
253251
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802
254252
github.com/Danny-Dasilva/fhttp v0.0.0-20240217042913-eeeb0b347ce1

‎go.sum‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7
6868
dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU=
6969
dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4=
7070
dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU=
71-
fyne.io/fyne/v2 v2.6.1 h1:kjPJD4/rBS9m2nHJp+npPSuaK79yj6ObMTuzR6VQ1Is=
72-
fyne.io/fyne/v2 v2.6.1/go.mod h1:YZt7SksjvrSNJCwbWFV32WON3mE1Sr7L41D29qMZ/lU=
7371
fyne.io/systray v1.11.0 h1:D9HISlxSkx+jHSniMBR6fCFOUjk1x/OOOJLa9lJYAKg=
7472
fyne.io/systray v1.11.0/go.mod h1:RVwqP9nYMo7h5zViCBHri2FgjXF7H2cub7MAq4NSoLs=
7573
git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
@@ -296,8 +294,6 @@ github.com/fyne-io/glfw-js v0.2.0 h1:8GUZtN2aCoTPNqgRDxK5+kn9OURINhBEBc7M4O1KrmM
296294
github.com/fyne-io/glfw-js v0.2.0/go.mod h1:Ri6te7rdZtBgBpxLW19uBpp3Dl6K9K/bRaYdJ22G8Jk=
297295
github.com/fyne-io/image v0.1.1 h1:WH0z4H7qfvNUw5l4p3bC1q70sa5+YWVt6HCj7y4VNyA=
298296
github.com/fyne-io/image v0.1.1/go.mod h1:xrfYBh6yspc+KjkgdZU/ifUC9sPA5Iv7WYUBzQKK7JM=
299-
github.com/fyne-io/oksvg v0.1.0 h1:7EUKk3HV3Y2E+qypp3nWqMXD7mum0hCw2KEGhI1fnBw=
300-
github.com/fyne-io/oksvg v0.1.0/go.mod h1:dJ9oEkPiWhnTFNCmRgEze+YNprJF7YRbpjgpWS4kzoI=
301297
github.com/gabriel-vasile/mimetype v1.4.7 h1:SKFKl7kD0RiPdbht0s7hFtjl489WcQ1VyPW8ZzUMYCA=
302298
github.com/gabriel-vasile/mimetype v1.4.7/go.mod h1:GDlAgAyIRT27BhFl53XNAFtfjzOkLaF35JdEG0P7LtU=
303299
github.com/gaukas/godicttls v0.0.4/go.mod h1:l6EenT4TLWgTdwslVb4sEMOCf7Bv0JAK67deKr9/NCI=
@@ -553,10 +549,6 @@ github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpg
553549
github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
554550
github.com/h12w/go-socks5 v0.0.0-20200522160539-76189e178364 h1:5XxdakFhqd9dnXoAZy1Mb2R/DZ6D1e+0bGC/JhucGYI=
555551
github.com/h12w/go-socks5 v0.0.0-20200522160539-76189e178364/go.mod h1:eDJQioIyy4Yn3MVivT7rv/39gAJTrA7lgmYr8EW950c=
556-
github.com/hack-pad/go-indexeddb v0.3.2 h1:DTqeJJYc1usa45Q5r52t01KhvlSN02+Oq+tQbSBI91A=
557-
github.com/hack-pad/go-indexeddb v0.3.2/go.mod h1:QvfTevpDVlkfomY498LhstjwbPW6QC4VC/lxYb0Kom0=
558-
github.com/hack-pad/safejs v0.1.0 h1:qPS6vjreAqh2amUqj4WNG1zIw7qlRQJ9K10eDKMCnE8=
559-
github.com/hack-pad/safejs v0.1.0/go.mod h1:HdS+bKF1NrE72VoXZeWzxFOVQVUSqZJAG0xNCnb+Tio=
560552
github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0=
561553
github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms=
562554
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@@ -1094,6 +1086,8 @@ github.com/xaionaro-go/avpipeline v0.0.0-20250428012319-401ac2ebe66c h1:KTQYCAJA
10941086
github.com/xaionaro-go/avpipeline v0.0.0-20250428012319-401ac2ebe66c/go.mod h1:Czl84biYuPZeILYiRiziR0yeuXKvrqQfzJ1ItjSq/o0=
10951087
github.com/xaionaro-go/datacounter v1.0.4 h1:+QMZLmu73R5WGkQfUPwlXF/JFN+Weo4iuDZkiL2wVm8=
10961088
github.com/xaionaro-go/datacounter v1.0.4/go.mod h1:Sf9vBevuV6w5iE6K3qJ9pWVKcyS60clWBUSQLjt5++c=
1089+
github.com/xaionaro-go/fyne/v2 v2.0.0-20250215180758-399edb421067 h1:58GgTbQcOCjv1ZZ46m6WQ8zqv0KEJe5C6D5Ls1oSHvc=
1090+
github.com/xaionaro-go/fyne/v2 v2.0.0-20250215180758-399edb421067/go.mod h1:0GOXKqyvNwk3DLmsFu9v0oYM0ZcD1ysGnlHCerKoAmo=
10971091
github.com/xaionaro-go/go-rtmp v0.0.0-20241009130244-1e3160f27f42 h1:izCjREd+62HDF9FRYqUI7dgJNdUxAIysEuqed8lBcDY=
10981092
github.com/xaionaro-go/go-rtmp v0.0.0-20241009130244-1e3160f27f42/go.mod h1:IuQWd+hy/tLuvuqFX0N9SMZrzOprM8Jvvdu+42RJwk4=
10991093
github.com/xaionaro-go/goobs v0.0.0-20241103210141-030e538ac440 h1:hzQ+65oWq54XAqheyJ9E6wt+WH75051w+eLP5zWlD68=
@@ -1284,6 +1278,8 @@ golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPI
12841278
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
12851279
golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
12861280
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
1281+
golang.org/x/mobile v0.0.0-20240404231514-09dbf07665ed h1:vZhAhVr5zF1IJaVKTawyTq78WSspLnK53iuMJ1fJgLc=
1282+
golang.org/x/mobile v0.0.0-20240404231514-09dbf07665ed/go.mod h1:z041I2NhLjANgIfD0XbB2AmUZ8sLUcSgyLaSNGEP50M=
12871283
golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
12881284
golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
12891285
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=

‎pkg/streampanel/chat_as_text.go‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"context"
55
"fmt"
66
"sync/atomic"
7-
"time"
87

98
"fyne.io/fyne/v2"
109
"fyne.io/fyne/v2/container"
@@ -128,6 +127,9 @@ func (ui *chatUIAsText) Rebuild(
128127
ui.newItem(ctx, itemIdx, msg)
129128
}
130129
})
130+
if ui.OnAdd != nil {
131+
ui.OnAdd(ctx, api.ChatMessage{})
132+
}
131133
})
132134
}
133135
func (ui *chatUIAsText) Append(
@@ -337,20 +339,6 @@ func (ui *chatUIAsText) newItem(
337339
}
338340
ui.Text.Segments = newSegments
339341
}
340-
ui.refreshAsync(ctx)
341-
}
342-
343-
func (ui *chatUIAsText) refreshAsync(
344-
ctx context.Context,
345-
) {
346-
if ui.RefreshCount.Add(1) > 2 {
347-
return
348-
}
349-
ui.RefreshLock.Do(ctx, func() {
350-
defer ui.RefreshCount.Add(-1)
351-
time.Sleep(200 * time.Millisecond)
352-
ui.ScrollingContainer.Refresh()
353-
})
354342
}
355343

356344
func (ui *chatUIAsText) onBanClicked(

‎pkg/streampanel/dashboard.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,10 @@ func (p *Panel) newDashboardWindow(
356356
c.Move(pos)
357357
}
358358
w.chat.ScrollToBottom(ctx)
359+
observability.Go(ctx, func() {
360+
time.Sleep(time.Second)
361+
w.chat.ScrollToBottom(ctx)
362+
})
359363
}
360364
w.chat.OnAdd(ctx, api.ChatMessage{})
361365
layers = append(layers,

‎pkg/streampanel/error.go‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"fyne.io/fyne/v2/container"
1313
"fyne.io/fyne/v2/widget"
1414
"github.com/facebookincubator/go-belt/tool/logger"
15-
"github.com/xaionaro-go/observability"
1615
"github.com/xaionaro-go/streamctl/pkg/consts"
1716
"github.com/xaionaro-go/xsync"
1817
)
@@ -60,15 +59,18 @@ func (p *Panel) getErrorReports() []errorReport {
6059

6160
func (p *Panel) statusPanelSet(text string) {
6261
ctx := context.TODO()
62+
var newText string
63+
var panel *widget.Label
6364
p.statusPanelLocker.Do(ctx, func() {
64-
panel := p.statusPanel
65+
panel = p.statusPanel
6566
if panel == nil {
6667
return
6768
}
68-
observability.Go(ctx, func() {
69-
panel.SetText("status: " + text)
70-
})
69+
newText = "status: " + text
7170
})
71+
if panel != nil {
72+
panel.SetText(newText)
73+
}
7274
}
7375

7476
func (p *Panel) ShowErrorReports() {

0 commit comments

Comments
 (0)