Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[V3-Linux] Fix linux compile and systray OnClicks #3886

Open
wants to merge 4 commits into
base: v3-alpha
Choose a base branch
from
+5 −4
Open

[V3-Linux] Fix linux compile and systray OnClicks #3886

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2583c65
fix linux compile
atterpac Nov 16, 2024
49e10f9
fix systray OnClick and OnRightClick
atterpac Nov 16, 2024
4f4f9a8
changelog.md
atterpac Nov 16, 2024
d747240
Merge branch 'v3-alpha' into v3/linux-systray-fixes
leaanthony Nov 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions mkdocs-website/docs/en/changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions v3/pkg/application/systemtray_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand All @@ -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
}

Expand Down
4 changes: 2 additions & 2 deletions v3/pkg/application/webview_window_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading