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

Add support for click event in Windows #59

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add support for click event in Windows #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74a4ccb
Add support for click event in Windows
Sep 16, 2018
554c038
Merge remote-tracking branch 'upstream/master'
Aug 6, 2020
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
12 changes: 11 additions & 1 deletion systray.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ import (
)

var (
log = golog.LoggerFor("systray")
// ClickedCh is the channel which will be notified when the systray icon is clicked
ClickedCh = make(chan struct{})
log = golog.LoggerFor("systray")

systrayReady func()
systrayExit func()
Expand Down Expand Up @@ -208,3 +210,11 @@ func systrayMenuItemSelected(id int32) {
default:
}
}

func systrayClicked() {
select {
case ClickedCh <- struct{}{}:
default:
showMenu()
}
}
3 changes: 3 additions & 0 deletions systray_nonwindows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ func nativeLoop() {
C.nativeLoop()
}

func showMenu() {
}

func quit() {
C.quit()
}
Expand Down
8 changes: 7 additions & 1 deletion systray_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,8 +281,10 @@ func (t *winTray) wndProc(hWnd windows.Handle, message uint32, wParam, lParam ui
systrayExit()
case t.wmSystrayMessage:
switch lParam {
case WM_RBUTTONUP, WM_LBUTTONUP:
case WM_RBUTTONUP:
t.showMenu()
case WM_LBUTTONUP:
systrayClicked()
}
case t.wmTaskbarCreated: // on explorer.exe restarts
t.muNID.Lock()
Expand Down Expand Up @@ -803,6 +805,10 @@ func nativeLoop() {
}
}

func showMenu() {
wt.showMenu()
}

func quit() {
const WM_CLOSE = 0x0010

Expand Down