From ea71836cd25750983e8ebec91da8bffa5937484b Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 2 May 2019 20:59:37 +0200 Subject: ui: use system icons in toolbar --- ui/iconprovider.go | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'ui/iconprovider.go') diff --git a/ui/iconprovider.go b/ui/iconprovider.go index 5ebf93bb..b56a4a5b 100644 --- a/ui/iconprovider.go +++ b/ui/iconprovider.go @@ -6,8 +6,12 @@ package ui import ( + "fmt" "github.com/lxn/walk" + "github.com/lxn/win" + "golang.org/x/sys/windows" "golang.zx2c4.com/wireguard/windows/service" + "path" ) type rectAndState struct { @@ -229,3 +233,15 @@ func (tsip *IconProvider) PaintForState(state service.TunnelState, canvas *walk. return nil } + +func loadSystemIcon(dll string, index uint) (*walk.Icon, error) { + system32, err := windows.GetSystemDirectory() + if err != nil { + return nil, err + } + hicon := win.ExtractIcon(win.GetModuleHandle(nil), windows.StringToUTF16Ptr(path.Join(system32, dll+".dll")), int32(index)) + if hicon <= 1 { + return nil, fmt.Errorf("Unable to find icon %d of %s", index, dll) + } + return walk.NewIconFromHICON(hicon) +} -- cgit v1.2.3-59-g8ed1b