deblan-mirror/wails
1
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2026-03-14 14:45:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

Refactor light/dark icons

Browse source
This commit is contained in:
Lea Anthony 2022-10-04 20:17:46 +11:00
commit a967ce0a29
No known key found for this signature in database
GPG key ID: 33DAF7BB90A58405
6 changed files with 60 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

3
v2/internal/platform/systray.go
View file

@ -3,13 +3,13 @@ package platform
import (
"github.com/wailsapp/wails/v2/internal/platform/systray"
"github.com/wailsapp/wails/v2/pkg/menu"
"github.com/wailsapp/wails/v2/pkg/options"
)
import "github.com/samber/lo"
type SysTray interface {
// SetTitle sets the title of the tray menu
SetTitle(title string)
SetIcons(lightModeIcon []byte, darkModeIcon []byte) error
SetTooltip(tooltip string) error
Show() error
Hide() error
@ -18,6 +18,7 @@ type SysTray interface {
AppendMenu(label string, callback menu.Callback)
AppendMenuItem(item *menu.MenuItem)
AppendSeparator()
SetIcons(lightModeIcon, darkModeIcon *options.SystemTrayIcon) error
}
func NewSysTray() SysTray {

49
v2/internal/platform/systray/windows.go
View file

@ -6,9 +6,10 @@ package systray
import (
"errors"
"github.com/samber/lo"
"github.com/wailsapp/wails/v2/internal/platform/win32"
"github.com/wailsapp/wails/v2/pkg/menu"
"golang.org/x/sys/windows"
"github.com/wailsapp/wails/v2/pkg/options"
"syscall"
"unsafe"
)
@ -22,17 +23,21 @@ var (
)
type Systray struct {
id uint32
hwnd win32.HWND
hinst win32.HINSTANCE
lclick func()
rclick func()
id uint32
hwnd win32.HWND
hinst win32.HINSTANCE
lclick func()
rclick func()
appIcon win32.HICON
lightModeIcon win32.HICON
darkModeIcon win32.HICON
currentIcon win32.HICON
Menu []*menu.MenuItem
quit chan struct{}
icon *options.SystemTrayIcon
}
func (p *Systray) Close() {
@ -115,6 +120,9 @@ func New() (*Systray, error) {
return nil, errors.New("shell notify version failed")
}
ni.appIcon = win32.LoadIconWithResourceID(0, uintptr(win32.IDI_APPLICATION))
ni.lightModeIcon = ni.appIcon
ni.darkModeIcon = ni.appIcon
ni.id = nid.UID
return ni, nil
}
@ -218,16 +226,23 @@ func (p *Systray) setVisible(visible bool) error {
return nil
}
func (p *Systray) SetIcons(lightModeIcon []byte, darkModeIcon []byte) error {
p.lightModeIcon = p.getIcon(lightModeIcon)
p.darkModeIcon = p.getIcon(darkModeIcon)
func (p *Systray) SetIcons(lightModeIcon, darkModeIcon *options.SystemTrayIcon) error {
var newLightModeIcon, newDarkModeIcon win32.HICON
if lightModeIcon != nil && lightModeIcon.Data != nil {
newLightModeIcon = p.getIcon(lightModeIcon.Data)
}
if darkModeIcon != nil && darkModeIcon.Data != nil {
newDarkModeIcon = p.getIcon(darkModeIcon.Data)
}
p.lightModeIcon, _ = lo.Coalesce(newLightModeIcon, newDarkModeIcon, p.appIcon)
p.darkModeIcon, _ = lo.Coalesce(newDarkModeIcon, newLightModeIcon, p.appIcon)
return p.updateIcon()
}
func (p *Systray) getIcon(icon []byte) win32.HICON {
result, err := win32.CreateHIconFromPNG(icon)
if err != nil {
result = win32.LoadIconWithResourceID(0, uintptr(win32.IDI_APPLICATION))
result = p.appIcon
}
return result
}
@ -269,7 +284,7 @@ func (p *Systray) WinProc(hwnd win32.HWND, msg uint32, wparam, lparam uintptr) u
}
}
case win32.WM_SETTINGCHANGE:
settingChanged := windows.UTF16PtrToString((*uint16)(unsafe.Pointer(lparam)))
settingChanged := win32.UTF16PtrToString(lparam)
if settingChanged == "ImmersiveColorSet" {
err := p.updateIcon()
if err != nil {
@ -313,10 +328,18 @@ func (p *Systray) Run() error {
}
func (p *Systray) updateIcon() error {
var newIcon win32.HICON
if win32.IsCurrentlyDarkMode() {
return p.setIcon(p.darkModeIcon)
newIcon = p.darkModeIcon
} else {
newIcon = p.lightModeIcon
}
return p.setIcon(p.lightModeIcon)
if p.currentIcon == newIcon {
return nil
}
p.currentIcon = newIcon
return p.setIcon(newIcon)
}
func RegisterWindow(name string, proc win32.WindowProc) (win32.HINSTANCE, error) {

5
v2/internal/platform/win32/window.go
View file

@ -3,6 +3,7 @@ package win32
import (
"fmt"
"github.com/samber/lo"
"golang.org/x/sys/windows"
"syscall"
"unsafe"
)
@ -124,6 +125,10 @@ func MustUTF16FromString(input string) []uint16 {
return ret
}
func UTF16PtrToString(input uintptr) string {
return windows.UTF16PtrToString((*uint16)(unsafe.Pointer(input)))
}
func SetForegroundWindow(wnd HWND) bool {
ret, _, _ := procSetForegroundWindow.Call(
uintptr(wnd),

4
v2/pkg/application/systray.go
View file

@ -10,8 +10,8 @@ import (
type SystemTray struct {
title string
hidden bool
lightModeIcon []byte
darkModeIcon []byte
lightModeIcon *options.SystemTrayIcon
darkModeIcon *options.SystemTrayIcon
tooltip string
startHidden bool

9
v2/pkg/options/options.go
View file

@ -170,12 +170,3 @@ func processDragOptions(appoptions *App) {
appoptions.CSSDragProperty = html.EscapeString(appoptions.CSSDragProperty)
appoptions.CSSDragValue = html.EscapeString(appoptions.CSSDragValue)
}
// SystemTray contains options for the system tray
type SystemTray struct {
LightModeIcon []byte
DarkModeIcon []byte
Title string
Tooltip string
StartHidden bool
}

15
v2/pkg/options/systemtray.go Normal file
View file

@ -0,0 +1,15 @@
package options
// SystemTray contains options for the system tray
type SystemTray struct {
LightModeIcon *SystemTrayIcon
DarkModeIcon *SystemTrayIcon
Title string
Tooltip string
StartHidden bool
}
// SystemTrayIcon represents a system tray icon
type SystemTrayIcon struct {
Data []byte
}