ui: simplify everything

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

1 files changed, 0 insertions, 332 deletions

diff --git a/ui/tunnelstatusimageprovider.go b/ui/tunnelstatusimageprovider.go
deleted file mode 100644
index 1120ecea..00000000
--- a/ui/tunnelstatusimageprovider.go
+++ /dev/null
@@ -1,332 +0,0 @@
-/* SPDX-License-Identifier: MIT
- *
- * Copyright (C) 2019 WireGuard LLC. All Rights Reserved.
- */
-
-package ui
-
-import (
-	"github.com/lxn/walk"
-	"golang.zx2c4.com/wireguard/windows/service"
-	"math"
-)
-
-type sizeAndState struct {
-	size  walk.Size
-	state service.TunnelState
-}
-
-type iconAndState struct {
-	icon  *walk.Icon
-	state service.TunnelState
-}
-
-type TunnelStatusImageProvider struct {
-	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
-}
-
-const (
-	colorStopped  = 0xe1e1e1
-	colorStarting = 0xfec031
-	colorStarted  = 0x36ce42
-)
-
-func hexColor(c uint32) walk.Color {
-	return walk.Color((((c >> 16) & 0xff) << 0) | (((c >> 8) & 0xff) << 8) | (((c >> 0) & 0xff) << 16))
-}
-
-func darkColor(c walk.Color) walk.Color {
-	// Convert to HSL
-	r, g, b := float64((uint32(c)>>16)&0xff)/255.0, float64((uint32(c)>>8)&0xff)/255.0, float64((uint32(c)>>0)&0xff)/255.0
-	min := math.Min(r, math.Min(g, b))
-	max := math.Max(r, math.Max(g, b))
-	deltaMinMax := max - min
-	l := (max + min) / 2
-	h, s := 0.0, 0.0
-	if deltaMinMax != 0 {
-		if l < 0.5 {
-			s = deltaMinMax / (max + min)
-		} else {
-			s = deltaMinMax / (2 - max - min)
-		}
-		deltaRed := (((max - r) / 6) + (deltaMinMax / 2)) / deltaMinMax
-		deltaGreen := (((max - g) / 6) + (deltaMinMax / 2)) / deltaMinMax
-		deltaBlue := (((max - b) / 6) + (deltaMinMax / 2)) / deltaMinMax
-		if r == max {
-			h = deltaBlue - deltaGreen
-		} else if g == max {
-			h = (1.0 / 3.0) + deltaRed - deltaBlue
-		} else if b == max {
-			h = (2.0 / 3.0) + deltaGreen - deltaRed
-		}
-
-		if h < 0 {
-			h += 1
-		} else if h > 1 {
-			h -= 1
-		}
-	}
-
-	// Darken by 10%
-	l = math.Max(0, l-0.1)
-
-	// Convert back to RGB
-	if s == 0 {
-		return walk.Color((uint32(l*255) << 16) | (uint32(l*255) << 8) | (uint32(l*255) << 0))
-	}
-	var v1, v2 float64
-	if l < 0.5 {
-		v2 = l * (1 + s)
-	} else {
-		v2 = (l + s) - (s * l)
-	}
-	v1 = 2.0*l - v2
-	co := func(v1, v2, vH float64) float64 {
-		if vH < 0 {
-			vH += 1
-		}
-		if vH > 1 {
-			vH -= 1
-		}
-		if (6.0 * vH) < 1 {
-			return v1 + (v2-v1)*6.0*vH
-		}
-		if (2.0 * vH) < 1 {
-			return v2
-		}
-		if (3.0 * vH) < 2 {
-			return v1 + (v2-v1)*((2.0/3.0)-vH)*6.0
-		}
-		return v1
-	}
-	r, g, b = co(v1, v2, h+(1.0/3.0)), co(v1, v2, h), co(v1, v2, h-(1.0/3.0))
-	return walk.Color((uint32(r*255) << 16) | (uint32(g*255) << 8) | (uint32(b*255) << 0))
-}
-
-func NewTunnelStatusImageProvider() (*TunnelStatusImageProvider, error) {
-	tsip := &TunnelStatusImageProvider{
-		imagesBySizeAndState:    make(map[sizeAndState]*walk.Bitmap),
-		iconsByBaseIconAndState: make(map[iconAndState]*walk.Icon),
-	}
-
-	var err error
-
-	var disposables walk.Disposables
-	defer disposables.Treat()
-
-	if tsip.stoppedBrush, err = walk.NewSolidColorBrush(hexColor(colorStopped)); err != nil {
-		return nil, err
-	}
-	disposables.Add(tsip.stoppedBrush)
-
-	if tsip.startingBrush, err = walk.NewSolidColorBrush(hexColor(colorStarting)); err != nil {
-		return nil, err
-	}
-	disposables.Add(tsip.startingBrush)
-
-	if tsip.startedBrush, err = walk.NewSolidColorBrush(hexColor(colorStarted)); err != nil {
-		return nil, err
-	}
-	disposables.Add(tsip.startedBrush)
-
-	if tsip.stoppedPen, err = walk.NewCosmeticPen(walk.PenSolid, darkColor(hexColor(colorStopped))); err != nil {
-		return nil, err
-	}
-	disposables.Add(tsip.stoppedPen)
-
-	if tsip.startingPen, err = walk.NewCosmeticPen(walk.PenSolid, darkColor(hexColor(colorStarting))); err != nil {
-		return nil, err
-	}
-	disposables.Add(tsip.startingPen)
-
-	if tsip.startedPen, err = walk.NewCosmeticPen(walk.PenSolid, darkColor(hexColor(colorStarted))); err != nil {
-		return nil, err
-	}
-	disposables.Add(tsip.startedPen)
-
-	disposables.Spare()
-
-	return tsip, nil
-}
-
-func (tsip *TunnelStatusImageProvider) Dispose() {
-	if tsip.imagesBySizeAndState != nil {
-		for _, img := range tsip.imagesBySizeAndState {
-			img.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
-	}
-	if tsip.startingBrush != nil {
-		tsip.startingBrush.Dispose()
-		tsip.startingBrush = nil
-	}
-	if tsip.startedBrush != nil {
-		tsip.startedBrush.Dispose()
-		tsip.startedBrush = nil
-	}
-	if tsip.stoppedPen != nil {
-		tsip.stoppedPen.Dispose()
-		tsip.stoppedPen = nil
-	}
-	if tsip.startingPen != nil {
-		tsip.startingPen.Dispose()
-		tsip.startingPen = nil
-	}
-	if tsip.startedPen != nil {
-		tsip.startedPen.Dispose()
-		tsip.startedPen = nil
-	}
-}
-
-func (tsip *TunnelStatusImageProvider) ImageForTunnel(tunnel *service.Tunnel, size walk.Size) (*walk.Bitmap, error) {
-	state, err := tunnel.State()
-	if err != nil {
-		return nil, err
-	}
-
-	return tsip.ImageForState(state, size)
-}
-
-func (tsip *TunnelStatusImageProvider) ImageForState(state service.TunnelState, size walk.Size) (*walk.Bitmap, error) {
-	key := sizeAndState{size, state}
-
-	if img, ok := tsip.imagesBySizeAndState[key]; ok {
-		return img, nil
-	}
-
-	img, err := walk.NewBitmapWithTransparentPixels(size)
-	if err != nil {
-		return nil, err
-	}
-
-	canvas, err := walk.NewCanvasFromImage(img)
-	if err != nil {
-		return nil, err
-	}
-	defer canvas.Dispose()
-
-	if err := tsip.PaintForState(state, canvas, walk.Rectangle{0, 0, size.Width, size.Height}); err != nil {
-		return nil, err
-	}
-
-	tsip.imagesBySizeAndState[key] = img
-
-	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 {
-		return err
-	}
-
-	return tsip.PaintForState(state, canvas, bounds)
-}
-
-func (tsip *TunnelStatusImageProvider) PaintForState(state service.TunnelState, canvas *walk.Canvas, bounds walk.Rectangle) error {
-	var (
-		brush *walk.SolidColorBrush
-		pen   *walk.CosmeticPen
-	)
-
-	switch state {
-	case service.TunnelStarted:
-		brush = tsip.startedBrush
-		pen = tsip.startedPen
-
-	case service.TunnelStarting:
-		brush = tsip.startingBrush
-		pen = tsip.startingPen
-
-	default:
-		brush = tsip.stoppedBrush
-		pen = tsip.stoppedPen
-	}
-
-	b := bounds
-
-	b.X += 4
-	b.Y += 4
-	b.Height -= 8
-	b.Width = b.Height
-
-	if err := canvas.FillEllipse(brush, b); err != nil {
-		return err
-	}
-	if err := canvas.DrawEllipse(pen, b); err != nil {
-		return err
-	}
-
-	return nil
-}