feat: the selected row is a shade of the terminal's background
lazysecrets asks the terminal for its background and shades the selection from it, a little lighter on a dark background and darker on a light one, where palette 8 was often too bright to read coloured rows on. Palette 8 stays until the terminal answers, or if it doesn't, and a theme's selection colours still win. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
b95eeb725b
commit
9963615e51
4 files changed
+64
-2
No files matched your search
@@ -489,7 +489,7 @@ func (m *Model) setVersions(items []provider.Object) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (m Model) Init() tea.Cmd {
|
func (m Model) Init() tea.Cmd {
|
||||||
cmds := []tea.Cmd{m.sourcesCmd(), m.spin.Tick, m.checkClipboard()}
|
cmds := []tea.Cmd{m.sourcesCmd(), m.spin.Tick, m.checkClipboard(), tea.RequestBackgroundColor}
|
||||||
if m.cachePath != "" || m.placeDir != "" {
|
if m.cachePath != "" || m.placeDir != "" {
|
||||||
cmds = append(cmds, tea.Tick(persistEvery, func(time.Time) tea.Msg { return persistTickMsg{} }))
|
cmds = append(cmds, tea.Tick(persistEvery, func(time.Time) tea.Msg { return persistTickMsg{} }))
|
||||||
}
|
}
|
||||||
@@ -514,6 +514,9 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
|||||||
var cmds []tea.Cmd
|
var cmds []tea.Cmd
|
||||||
|
|
||||||
switch msg := msg.(type) {
|
switch msg := msg.(type) {
|
||||||
|
case tea.BackgroundColorMsg:
|
||||||
|
m.st = m.st.OnBackground(msg.Color, msg.IsDark())
|
||||||
|
return m, nil
|
||||||
case tea.WindowSizeMsg:
|
case tea.WindowSizeMsg:
|
||||||
m.w, m.h = msg.Width, msg.Height
|
m.w, m.h = msg.Width, msg.Height
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,8 @@
|
|||||||
package styles
|
package styles
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"image/color"
|
||||||
|
|
||||||
"charm.land/lipgloss/v2"
|
"charm.land/lipgloss/v2"
|
||||||
|
|
||||||
"git.kebcloud.no/keb/lazysecrets/internal/provider"
|
"git.kebcloud.no/keb/lazysecrets/internal/provider"
|
||||||
@@ -32,6 +34,10 @@ type Styles struct {
|
|||||||
KindAzure lipgloss.Style
|
KindAzure lipgloss.Style
|
||||||
KindDatabricks lipgloss.Style
|
KindDatabricks lipgloss.Style
|
||||||
KindRepo lipgloss.Style
|
KindRepo lipgloss.Style
|
||||||
|
|
||||||
|
// themed marks the selection colours as set by the theme, so
|
||||||
|
// OnBackground leaves them.
|
||||||
|
themed, themedBlurred bool
|
||||||
}
|
}
|
||||||
|
|
||||||
func Default() Styles {
|
func Default() Styles {
|
||||||
@@ -45,7 +51,8 @@ func Default() Styles {
|
|||||||
|
|
||||||
// A background rather than reverse, so the row keeps its colours;
|
// A background rather than reverse, so the row keeps its colours;
|
||||||
// in every pane, so each shows what's selected in it. The focused
|
// in every pane, so each shows what's selected in it. The focused
|
||||||
// pane's is bold too.
|
// pane's is bold too. Palette 8 until the terminal says what its
|
||||||
|
// background is (OnBackground).
|
||||||
Selected: lipgloss.NewStyle().Background(lipgloss.BrightBlack).Bold(true),
|
Selected: lipgloss.NewStyle().Background(lipgloss.BrightBlack).Bold(true),
|
||||||
SelectedBlurred: lipgloss.NewStyle().Background(lipgloss.BrightBlack),
|
SelectedBlurred: lipgloss.NewStyle().Background(lipgloss.BrightBlack),
|
||||||
Muted: lipgloss.NewStyle().Faint(true),
|
Muted: lipgloss.NewStyle().Faint(true),
|
||||||
@@ -76,3 +83,23 @@ func (s Styles) Kind(k provider.Kind) lipgloss.Style {
|
|||||||
}
|
}
|
||||||
return s.KindAzure
|
return s.KindAzure
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// OnBackground shades the selection colours from the terminal's
|
||||||
|
// background, a little lighter on a dark one and darker on a light one:
|
||||||
|
// a quiet band that keeps the row's colours readable, where palette 8 is
|
||||||
|
// often too bright. Colours the theme sets are kept.
|
||||||
|
func (s Styles) OnBackground(bg color.Color, dark bool) Styles {
|
||||||
|
shade := func(p float64) color.Color {
|
||||||
|
if dark {
|
||||||
|
return lipgloss.Lighten(bg, p)
|
||||||
|
}
|
||||||
|
return lipgloss.Darken(bg, p)
|
||||||
|
}
|
||||||
|
if !s.themed {
|
||||||
|
s.Selected = s.Selected.Background(shade(0.09))
|
||||||
|
}
|
||||||
|
if !s.themedBlurred {
|
||||||
|
s.SelectedBlurred = s.SelectedBlurred.Background(shade(0.05))
|
||||||
|
}
|
||||||
|
return s
|
||||||
|
}
|
||||||
@@ -70,8 +70,10 @@ func FromTheme(theme map[string][]string) (Styles, color.Color, error) {
|
|||||||
st.BorderBlurred = v.fg(lipgloss.NewStyle())
|
st.BorderBlurred = v.fg(lipgloss.NewStyle())
|
||||||
case "selectedLineBgColor":
|
case "selectedLineBgColor":
|
||||||
st.Selected = v.bg(lipgloss.NewStyle()).Bold(true)
|
st.Selected = v.bg(lipgloss.NewStyle()).Bold(true)
|
||||||
|
st.themed = true
|
||||||
case "inactiveViewSelectedLineBgColor":
|
case "inactiveViewSelectedLineBgColor":
|
||||||
st.SelectedBlurred = v.bg(lipgloss.NewStyle()).Bold(true)
|
st.SelectedBlurred = v.bg(lipgloss.NewStyle()).Bold(true)
|
||||||
|
st.themedBlurred = true
|
||||||
case "defaultFgColor":
|
case "defaultFgColor":
|
||||||
fg = v.color
|
fg = v.color
|
||||||
case "optionsTextColor":
|
case "optionsTextColor":
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package styles
|
package styles
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
@@ -62,3 +63,32 @@ func TestEmptyThemeIsDefault(t *testing.T) {
|
|||||||
t.Errorf("empty theme: %v %v reverse=%v bg=%v", err, fg, st.Selected.GetReverse(), st.Selected.GetBackground())
|
t.Errorf("empty theme: %v %v reverse=%v bg=%v", err, fg, st.Selected.GetReverse(), st.Selected.GetBackground())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestOnBackground(t *testing.T) {
|
||||||
|
hex := func(c any) string {
|
||||||
|
r, g, b, _ := c.(interface{ RGBA() (r, g, b, a uint32) }).RGBA()
|
||||||
|
return fmt.Sprintf("#%02x%02x%02x", r>>8, g>>8, b>>8)
|
||||||
|
}
|
||||||
|
st := Default().OnBackground(lipgloss.Color("#282c34"), true)
|
||||||
|
if got := hex(st.Selected.GetBackground()); got != "#3e424a" {
|
||||||
|
t.Errorf("dark: selected %s", got)
|
||||||
|
}
|
||||||
|
if got := hex(st.SelectedBlurred.GetBackground()); got != "#343840" {
|
||||||
|
t.Errorf("dark: blurred %s", got)
|
||||||
|
}
|
||||||
|
if got := hex(Default().OnBackground(lipgloss.Color("#ffffff"), false).Selected.GetBackground()); got != "#e8e8e8" {
|
||||||
|
t.Errorf("light: selected %s", got)
|
||||||
|
}
|
||||||
|
|
||||||
|
themed, _, err := FromTheme(map[string][]string{"selectedLineBgColor": {"#2d3f76"}})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
st = themed.OnBackground(lipgloss.Color("#282c34"), true)
|
||||||
|
if got := hex(st.Selected.GetBackground()); got != "#2d3f76" {
|
||||||
|
t.Errorf("themed: selected %s (want the theme's)", got)
|
||||||
|
}
|
||||||
|
if got := hex(st.SelectedBlurred.GetBackground()); got != "#343840" {
|
||||||
|
t.Errorf("themed: blurred %s (not themed: shaded)", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in new issue
Block a user