From b981aa576c9164450ebbbe927a201cf478dfbadf Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Sun, 3 Jan 2021 16:28:29 +0100 Subject: [PATCH] cmd/tailscale,go.*: update Gio version Fixes tailscale/tailscale#471 Signed-off-by: Elias Naur --- cmd/tailscale/ui.go | 9 +++++++-- go.mod | 2 +- go.sum | 3 ++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/cmd/tailscale/ui.go b/cmd/tailscale/ui.go index d369bb1..113748c 100644 --- a/cmd/tailscale/ui.go +++ b/cmd/tailscale/ui.go @@ -161,13 +161,18 @@ func newUI(store *stateStore) (*UI, error) { ui.icons.logo = paint.NewImageOp(logo) ui.icons.google = paint.NewImageOp(google) ui.icons.more.Color = rgb(white) - ui.icons.search.Color = ui.theme.Color.Hint + ui.icons.search.Color = mulAlpha(ui.theme.Palette.Fg, 0xbb) ui.root.Axis = layout.Vertical ui.intro.list.Axis = layout.Vertical ui.search.SingleLine = true return ui, nil } +func mulAlpha(c color.NRGBA, alpha uint8) color.NRGBA { + c.A = uint8(uint32(c.A) * uint32(alpha) / 0xff) + return c +} + func (ui *UI) onBack() bool { if !ui.menu.show { return false @@ -768,7 +773,7 @@ func (ui *UI) layoutLocal(gtx layout.Context, sysIns system.Insets, host, addr s layout.Rigid(func(gtx C) D { return layout.Inset{Bottom: unit.Dp(4)}.Layout(gtx, func(gtx C) D { name := material.H6(ui.theme, host) - name.Color = ui.theme.Color.InvText + name.Color = rgb(0xffffff) return name.Layout(gtx) }) }), diff --git a/go.mod b/go.mod index 9f80b77..f61eedf 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.14 require ( eliasnaur.com/font v0.0.0-20200617114307-e02d32decb4b - gioui.org v0.0.0-20201119103011-21ef492cc9df + gioui.org v0.0.0-20210103130323-7bfdafb7b15d gioui.org/cmd v0.0.0-20201126101740-9b54892cc4e3 github.com/go-bindata/go-bindata v3.1.2+incompatible github.com/tailscale/wireguard-go v0.0.0-20201021041318-a6168fd06b3f diff --git a/go.sum b/go.sum index 3c6156c..fe03eb7 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,9 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= eliasnaur.com/font v0.0.0-20200617114307-e02d32decb4b h1:J9r7EuPdhvBTafg34EqrObAm/bDEaDh7LvhKJPGficE= eliasnaur.com/font v0.0.0-20200617114307-e02d32decb4b/go.mod h1:CYwJpIhpzVfoHpFXGlXjSx9mXMWtHt4XXmZb6RjumRc= -gioui.org v0.0.0-20201119103011-21ef492cc9df h1:rbPrGAuu3VRB5ip6X8v1NN+P79oWEBGWYEI+Qreqvpg= gioui.org v0.0.0-20201119103011-21ef492cc9df/go.mod h1:Y+uS7hHMvku1Q+ooaoq6fYD5B2LGoT8JtFgvmYmRzTw= +gioui.org v0.0.0-20210103130323-7bfdafb7b15d h1:VkwllpRglnx7yZAgA3VgrtxO9x9wwBYHReaKygWV8go= +gioui.org v0.0.0-20210103130323-7bfdafb7b15d/go.mod h1:Y+uS7hHMvku1Q+ooaoq6fYD5B2LGoT8JtFgvmYmRzTw= gioui.org/cmd v0.0.0-20201126101740-9b54892cc4e3 h1:WljgIPO0LPLOUhi92gMK7kacyWefdTtAamOFul0NxVI= gioui.org/cmd v0.0.0-20201126101740-9b54892cc4e3/go.mod h1:wLdMwDGN/6zG8SRs7QBEUXf096UcKwco7sSlzehIYho= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=