From 592e099ad6eef58e4f9580850a547718d4ffa6ce Mon Sep 17 00:00:00 2001
From: Alexander Neumann <alexander.neumann@picos-software.com>
Date: Tue, 23 Apr 2019 17:37:10 +0200
Subject: ui: overlay main window and tray icons according to tunnel status

Signed-off-by: Alexander Neumann <alexander.neumann@picos-software.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 ui/tunnelstatusimageprovider.go | 93 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 79 insertions(+), 14 deletions(-)

(limited to 'ui/tunnelstatusimageprovider.go')

diff --git a/ui/tunnelstatusimageprovider.go b/ui/tunnelstatusimageprovider.go
index f1ddcda1..99447526 100644
--- a/ui/tunnelstatusimageprovider.go
+++ b/ui/tunnelstatusimageprovider.go
@@ -15,18 +15,28 @@ type sizeAndState struct {
 	state service.TunnelState
 }
 
+type iconAndState struct {
+	icon  *walk.Icon
+	state service.TunnelState
+}
+
 type TunnelStatusImageProvider struct {
-	imagesBySizeAndState map[sizeAndState]*walk.Bitmap
-	stoppedBrush         *walk.SolidColorBrush
-	startingBrush        *walk.SolidColorBrush
-	startedBrush         *walk.SolidColorBrush
-	stoppedPen           *walk.CosmeticPen
-	startingPen          *walk.CosmeticPen
-	startedPen           *walk.CosmeticPen
+	imagesBySizeAndState    map[sizeAndState]*walk.Bitmap
+	iconsByBaseIconAndState map[iconAndState]*walk.Icon
+	stoppedBrush            *walk.SolidColorBrush
+	startingBrush           *walk.SolidColorBrush
+	startedBrush            *walk.SolidColorBrush
+	stoppedPen              *walk.CosmeticPen
+	startingPen             *walk.CosmeticPen
+	startedPen              *walk.CosmeticPen
 }
 
 func NewTunnelStatusImageProvider() (*TunnelStatusImageProvider, error) {
-	tsip := &TunnelStatusImageProvider{imagesBySizeAndState: make(map[sizeAndState]*walk.Bitmap)}
+	tsip := &TunnelStatusImageProvider{
+		imagesBySizeAndState:    make(map[sizeAndState]*walk.Bitmap),
+		iconsByBaseIconAndState: make(map[iconAndState]*walk.Icon),
+	}
+
 	var err error
 
 	var disposables walk.Disposables
@@ -74,6 +84,12 @@ func (tsip *TunnelStatusImageProvider) Dispose() {
 		}
 		tsip.imagesBySizeAndState = nil
 	}
+	if tsip.iconsByBaseIconAndState != nil {
+		for _, icon := range tsip.iconsByBaseIconAndState {
+			icon.Dispose()
+		}
+		tsip.iconsByBaseIconAndState = nil
+	}
 	if tsip.stoppedBrush != nil {
 		tsip.stoppedBrush.Dispose()
 		tsip.stoppedBrush = nil
@@ -116,9 +132,6 @@ func (tsip *TunnelStatusImageProvider) ImageForState(state service.TunnelState,
 		return img, nil
 	}
 
-	var disposables walk.Disposables
-	defer disposables.Treat()
-
 	img, err := walk.NewBitmapWithTransparentPixels(size)
 	if err != nil {
 		return nil, err
@@ -136,11 +149,63 @@ func (tsip *TunnelStatusImageProvider) ImageForState(state service.TunnelState,
 
 	tsip.imagesBySizeAndState[key] = img
 
-	disposables.Spare()
-
 	return img, nil
 }
 
+func (tsip *TunnelStatusImageProvider) IconWithOverlayForTunnel(baseIcon *walk.Icon, tunnel *service.Tunnel) (*walk.Icon, error) {
+	state, err := tunnel.State()
+	if err != nil {
+		return nil, err
+	}
+
+	return tsip.IconWithOverlayForState(baseIcon, state)
+}
+
+func (tsip *TunnelStatusImageProvider) IconWithOverlayForState(baseIcon *walk.Icon, state service.TunnelState) (*walk.Icon, error) {
+	key := iconAndState{baseIcon, state}
+
+	if icon, ok := tsip.iconsByBaseIconAndState[key]; ok {
+		return icon, nil
+	}
+
+	size := baseIcon.Size()
+
+	bmp, err := walk.NewBitmapWithTransparentPixels(size)
+	if err != nil {
+		return nil, err
+	}
+	defer bmp.Dispose()
+
+	canvas, err := walk.NewCanvasFromImage(bmp)
+	if err != nil {
+		return nil, err
+	}
+	defer canvas.Dispose()
+
+	if err := canvas.DrawImage(baseIcon, walk.Point{}); err != nil {
+		return nil, err
+	}
+
+	w := int(float64(size.Width) * 0.75)
+	h := int(float64(size.Height) * 0.75)
+	bounds := walk.Rectangle{4 + size.Width - w, 4 + size.Height - h, w, h}
+
+	if err := tsip.PaintForState(state, canvas, bounds); err != nil {
+		return nil, err
+	}
+
+	canvas.Dispose()
+
+	icon, err := walk.NewIconFromBitmap(bmp)
+	if err != nil {
+		return nil, err
+	}
+
+	tsip.iconsByBaseIconAndState[key] = icon
+
+	return icon, nil
+}
+
 func (tsip *TunnelStatusImageProvider) PaintForTunnel(tunnel *service.Tunnel, canvas *walk.Canvas, bounds walk.Rectangle) error {
 	state, err := tunnel.State()
 	if err != nil {
@@ -172,7 +237,7 @@ func (tsip *TunnelStatusImageProvider) PaintForState(state service.TunnelState,
 
 	b := bounds
 
-	b.X = 4
+	b.X += 4
 	b.Y += 4
 	b.Height -= 8
 	b.Width = b.Height
-- 
cgit v1.2.3-59-g8ed1b