aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/ui/iconprovider.go
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2019-05-01 18:30:07 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2019-05-02 08:41:08 +0200
commit0bc8cd5e206ca0c5450c4d0b5e4a6e011aee2a84 (patch)
treebdc67110c0e9aca3ccde87b1c263e9c34df01594 /ui/iconprovider.go
parentui: rework margins (diff)
downloadwireguard-windows-0bc8cd5e206ca0c5450c4d0b5e4a6e011aee2a84.tar.xz
wireguard-windows-0bc8cd5e206ca0c5450c4d0b5e4a6e011aee2a84.zip
ui: use icons instead of unicode font
Diffstat (limited to '')
-rw-r--r--ui/iconprovider.go16
1 files changed, 8 insertions, 8 deletions
diff --git a/ui/iconprovider.go b/ui/iconprovider.go
index f9d3597e..64d5775d 100644
--- a/ui/iconprovider.go
+++ b/ui/iconprovider.go
@@ -17,7 +17,7 @@ type rectAndState struct {
}
type IconProvider struct {
- baseIcon *walk.Icon
+ wireguardIcon *walk.Icon
imagesByRectAndState map[rectAndState]*walk.Bitmap
iconsByState map[service.TunnelState]*walk.Icon
stoppedBrush *walk.SolidColorBrush
@@ -121,10 +121,10 @@ func NewIconProvider(dpi int) (*IconProvider, error) {
var disposables walk.Disposables
defer disposables.Treat()
- if tsip.baseIcon, err = walk.NewIconFromResourceId(1); err != nil {
+ if tsip.wireguardIcon, err = walk.NewIconFromResource("$wireguard.ico"); err != nil {
return nil, err
}
- disposables.Add(tsip.baseIcon)
+ disposables.Add(tsip.wireguardIcon)
if tsip.stoppedBrush, err = walk.NewSolidColorBrush(hexColor(colorStopped)); err != nil {
return nil, err
@@ -202,9 +202,9 @@ func (tsip *IconProvider) Dispose() {
tsip.startedPen.Dispose()
tsip.startedPen = nil
}
- if tsip.baseIcon != nil {
- tsip.baseIcon.Dispose()
- tsip.baseIcon = nil
+ if tsip.wireguardIcon != nil {
+ tsip.wireguardIcon.Dispose()
+ tsip.wireguardIcon = nil
}
if tsip.updateAvailableImage != nil {
tsip.updateAvailableImage.Dispose()
@@ -299,7 +299,7 @@ func (tsip *IconProvider) IconWithOverlayForState(state service.TunnelState) (*w
return icon, nil
}
- size := tsip.baseIcon.Size()
+ size := tsip.wireguardIcon.Size()
bmp, err := walk.NewBitmapWithTransparentPixels(size)
if err != nil {
@@ -313,7 +313,7 @@ func (tsip *IconProvider) IconWithOverlayForState(state service.TunnelState) (*w
}
defer canvas.Dispose()
- if err := canvas.DrawImage(tsip.baseIcon, walk.Point{}); err != nil {
+ if err := canvas.DrawImage(tsip.wireguardIcon, walk.Point{}); err != nil {
return nil, err
}