diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-16 14:46:53 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-03-17 19:13:40 +1100 |
| commit | 1dd7307fde033dae5fececac15810a99e26c3d91 (patch) | |
| tree | 4e851c9e3229a6fe3b4191f6311d05d7a9142960 /pkg/gui/style | |
| parent | a90b6efded49abcfa2516db794d7875b0396f558 (diff) | |
start moving commit panel handlers into controller
more
and more
move rebase commit refreshing into existing abstraction
and more
and more
WIP
and more
handling clicks
properly fix merge conflicts
update cheatsheet
lots more preparation to start moving things into controllers
WIP
better typing
expand on remotes controller
moving more code into controllers
Diffstat (limited to 'pkg/gui/style')
| -rw-r--r-- | pkg/gui/style/style_test.go | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/pkg/gui/style/style_test.go b/pkg/gui/style/style_test.go index 360ad00e6..c8157efd6 100644 --- a/pkg/gui/style/style_test.go +++ b/pkg/gui/style/style_test.go @@ -135,7 +135,7 @@ func TestMerge(t *testing.T) { "\x1b[38;2;255;0;255;48;2;255;255;0;1;4mfoo\x1b[0m", }, { - "mix color-16 with rgb colors", + "mix color-16 (background) with rgb (foreground)", []TextStyle{New().SetFg(rgbYellow), BgRed}, TextStyle{ fg: &rgbYellow, @@ -147,6 +147,19 @@ func TestMerge(t *testing.T) { }, "\x1b[38;2;255;255;0;48;2;197;30;20mfoo\x1b[0m", }, + { + "mix color-16 (foreground) with rgb (background)", + []TextStyle{FgRed, New().SetBg(rgbYellow)}, + TextStyle{ + fg: &Color{basic: &fgRed}, + bg: &rgbYellow, + Style: color.NewRGBStyle( + fgRed.RGB(), + rgbYellowLib, + ).SetOpts(color.Opts{}), + }, + "\x1b[38;2;197;30;20;48;2;255;255;0mfoo\x1b[0m", + }, } for _, s := range scenarios { |