diff options
Diffstat (limited to 'ui/iconprovider.go')
| -rw-r--r-- | ui/iconprovider.go | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/ui/iconprovider.go b/ui/iconprovider.go index 8db841c5..154a1628 100644 --- a/ui/iconprovider.go +++ b/ui/iconprovider.go @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT * - * Copyright (C) 2019 WireGuard LLC. All Rights Reserved. + * Copyright (C) 2019-2022 WireGuard LLC. All Rights Reserved. */ package ui @@ -73,11 +73,11 @@ func iconForState(state manager.TunnelState, size int) (icon *walk.Icon, err err } switch state { case manager.TunnelStarted: - icon, err = loadSystemIcon("imageres", 101, size) + icon, err = loadSystemIcon("imageres", -106, size) case manager.TunnelStopped: - icon, err = walk.NewIconFromResourceWithSize("dot-gray.ico", walk.Size{size, size}) // TODO: replace with real icon + icon, err = walk.NewIconFromResourceIdWithSize(8, walk.Size{size, size}) // TODO: replace with real icon from imageres/shell32 default: - icon, err = loadSystemIcon("shell32", 238, size) // TODO: this doesn't look that great overlayed on the app icon + icon, err = loadSystemIcon("shell32", -16739, size) // TODO: this doesn't look that great overlayed on the app icon } if err == nil { cachedIconsForWidthAndState[widthAndState{size, state}] = icon @@ -121,6 +121,14 @@ func loadSystemIcon(dll string, index int32, size int) (icon *walk.Icon, err err return } +func loadShieldIcon(size int) (icon *walk.Icon, err error) { + icon, err = loadSystemIcon("imageres", -1028, size) + if err != nil { + icon, err = loadSystemIcon("imageres", 1, size) + } + return +} + var cachedLogoIconsForWidth = make(map[int]*walk.Icon) func loadLogoIcon(size int) (icon *walk.Icon, err error) { @@ -128,7 +136,7 @@ func loadLogoIcon(size int) (icon *walk.Icon, err error) { if icon != nil { return } - icon, err = walk.NewIconFromResourceWithSize("$wireguard.ico", walk.Size{size, size}) + icon, err = walk.NewIconFromResourceIdWithSize(7, walk.Size{size, size}) if err == nil { cachedLogoIconsForWidth[size] = icon } |