From 2583c6524bdc4801223ea9bd60336bf141d46300 Mon Sep 17 00:00:00 2001 From: atterpac Date: Sat, 16 Nov 2024 16:09:56 -0700 Subject: [PATCH 1/3] fix linux compile --- v3/pkg/application/webview_window_linux.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/v3/pkg/application/webview_window_linux.go b/v3/pkg/application/webview_window_linux.go index e77cd7bd823..a43ae2e82ed 100644 --- a/v3/pkg/application/webview_window_linux.go +++ b/v3/pkg/application/webview_window_linux.go @@ -296,9 +296,9 @@ func (w *linuxWebviewWindow) run() { w.setFrameless(w.parent.options.Frameless) if w.parent.options.InitialPosition == WindowCentered { - C.windowCenter(w.nsWindow) + w.center() } else { - w.setPosition(options.X, options.Y) + w.setPosition(w.parent.options.X, w.parent.options.Y) } switch w.parent.options.StartState { From 49e10f927bcf98a2e8cb8b32a14a41c52d11d36b Mon Sep 17 00:00:00 2001 From: atterpac Date: Sat, 16 Nov 2024 16:10:26 -0700 Subject: [PATCH 2/3] fix systray OnClick and OnRightClick --- v3/pkg/application/systemtray_linux.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/v3/pkg/application/systemtray_linux.go b/v3/pkg/application/systemtray_linux.go index 2a8abfd08eb..57eb49f8ff0 100644 --- a/v3/pkg/application/systemtray_linux.go +++ b/v3/pkg/application/systemtray_linux.go @@ -698,7 +698,7 @@ func (s *linuxSystemTray) GetLayout(parentID int32, recursionDepth int32, proper // Activate implements org.kde.StatusNotifierItem.Activate method. func (s *linuxSystemTray) Activate(x int32, y int32) (err *dbus.Error) { - fmt.Println("Activate", x, y) + s.parent.clickHandler() return } @@ -715,7 +715,7 @@ func (s *linuxSystemTray) Scroll(delta int32, orientation string) (err *dbus.Err // SecondaryActivate implements org.kde.StatusNotifierItem.SecondaryActivate method. func (s *linuxSystemTray) SecondaryActivate(x int32, y int32) (err *dbus.Error) { - fmt.Println("SecondaryActivate", x, y) + s.parent.rightClickHandler() return } From 4f4f9a87dab4b98d87a436b6306a9cd792ff200d Mon Sep 17 00:00:00 2001 From: atterpac Date: Sat, 16 Nov 2024 16:36:51 -0700 Subject: [PATCH 3/3] changelog.md --- mkdocs-website/docs/en/changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/mkdocs-website/docs/en/changelog.md b/mkdocs-website/docs/en/changelog.md index c07d2bc149e..83f0f36fc98 100644 --- a/mkdocs-website/docs/en/changelog.md +++ b/mkdocs-website/docs/en/changelog.md @@ -38,6 +38,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Consolidated dev config into `config.yml` by [leaanthony](https://github.com/leaanthony) ### Fixed +- Fixed Linux systray `OnClick` and `OnRightClick` implementation by @atterpac in [#3886](https://github.com/wailsapp/wails/pull/3886) - Fixed `AlwaysOnTop` not working on Mac by [leaanthony](https://github.com/leaanthony) in [#3841](https://github.com/wailsapp/wails/pull/3841) - [darwin] Fixed `application.NewEditMenu` including a duplicate `PasteAndMatchStyle` role in the edit menu on Darwin by [johnmccabe](https://github.com/johnmccabe) in [#3839](https://github.com/wailsapp/wails/pull/3839) - [linux] Fixed aarch64 compilation [#3840](https://github.com/wailsapp/wails/issues/3840) in [#3854](https://github.com/wailsapp/wails/pull/3854) by [kodflow](https://github.com/kodflow)