diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-05-15 20:43:16 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-05-15 21:12:12 +1000 |
| commit | 913f17ee3e2c74dac354005d0ee446ae4a6eab52 (patch) | |
| tree | ce8e7c922e757c339d5737c963b0bee0bceea365 /pkg/gui | |
| parent | 6291c539663b8646a3c09bc6e94c3a088abd7b39 (diff) | |
prevent flicker from bolding background of selected line
Diffstat (limited to 'pkg/gui')
| -rw-r--r-- | pkg/gui/merge_panel.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/gui/merge_panel.go b/pkg/gui/merge_panel.go index d30f152ac..7d2e8fc52 100644 --- a/pkg/gui/merge_panel.go +++ b/pkg/gui/merge_panel.go @@ -59,7 +59,7 @@ func (gui *Gui) coloredConflictFile(content string, conflicts []commands.Conflic colour := color.New(colourAttr) if hasFocus && conflictIndex < len(conflicts) && conflicts[conflictIndex] == conflict && gui.shouldHighlightLine(i, conflict, conflictTop) { colour.Add(color.Bold) - colour.Add(theme.SelectedLineBgColor) + colour.Add(theme.SelectedRangeBgColor) } if i == conflict.End && len(remainingConflicts) > 0 { conflict, remainingConflicts = gui.shiftConflict(remainingConflicts) |