mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-01-24 05:36:19 +02:00
f3eb180f75
We're not fully standardising here: different contexts can store their range state however they like. What we are standardising on is that now the view is always responsible for highlighting the selected lines, meaning the context/controller needs to tell the view where the range start is. Two convenient benefits from this change: 1) we no longer need bespoke code in integration tests for asserting on selected lines because we can just ask the view 2) line selection in staging/patch-building/merge-conflicts views now look the same as in list views i.e. the highlight applies to the whole line (including trailing space) I also noticed a bug with merge conflicts not rendering the selection on focus though I suspect it wasn't a bug with any real consequences when the view wasn't displaying the selection. I'm going to scrap the selectedRangeBgColor config and just let it use the single line background color. Hopefully nobody cares, but there's really no need for an extra config.
71 lines
2.7 KiB
Go
71 lines
2.7 KiB
Go
package theme
|
|
|
|
import (
|
|
"github.com/jesseduffield/gocui"
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/style"
|
|
)
|
|
|
|
var (
|
|
// DefaultTextColor is the default text color
|
|
DefaultTextColor = style.FgDefault
|
|
|
|
// GocuiDefaultTextColor does the same as DefaultTextColor but this one only colors gocui default text colors
|
|
GocuiDefaultTextColor = gocui.ColorDefault
|
|
|
|
// ActiveBorderColor is the border color of the active frame
|
|
ActiveBorderColor gocui.Attribute
|
|
|
|
// InactiveBorderColor is the border color of the inactive active frames
|
|
InactiveBorderColor gocui.Attribute
|
|
|
|
// FilteredActiveBorderColor is the border color of the active frame, when it's being searched/filtered
|
|
SearchingActiveBorderColor gocui.Attribute
|
|
|
|
// GocuiSelectedLineBgColor is the background color for the selected line in gocui
|
|
GocuiSelectedLineBgColor gocui.Attribute
|
|
|
|
OptionsColor gocui.Attribute
|
|
|
|
// SelectedLineBgColor is the background color for the selected line
|
|
SelectedLineBgColor = style.New()
|
|
|
|
// CherryPickedCommitColor is the text style when cherry picking a commit
|
|
CherryPickedCommitTextStyle = style.New()
|
|
|
|
// MarkedBaseCommitTextStyle is the text style of the marked rebase base commit
|
|
MarkedBaseCommitTextStyle = style.New()
|
|
|
|
OptionsFgColor = style.New()
|
|
|
|
DiffTerminalColor = style.FgMagenta
|
|
|
|
UnstagedChangesColor = style.New()
|
|
)
|
|
|
|
// UpdateTheme updates all theme variables
|
|
func UpdateTheme(themeConfig config.ThemeConfig) {
|
|
ActiveBorderColor = GetGocuiStyle(themeConfig.ActiveBorderColor)
|
|
InactiveBorderColor = GetGocuiStyle(themeConfig.InactiveBorderColor)
|
|
SearchingActiveBorderColor = GetGocuiStyle(themeConfig.SearchingActiveBorderColor)
|
|
SelectedLineBgColor = GetTextStyle(themeConfig.SelectedLineBgColor, true)
|
|
|
|
cherryPickedCommitBgTextStyle := GetTextStyle(themeConfig.CherryPickedCommitBgColor, true)
|
|
cherryPickedCommitFgTextStyle := GetTextStyle(themeConfig.CherryPickedCommitFgColor, false)
|
|
CherryPickedCommitTextStyle = cherryPickedCommitBgTextStyle.MergeStyle(cherryPickedCommitFgTextStyle)
|
|
|
|
markedBaseCommitBgTextStyle := GetTextStyle(themeConfig.MarkedBaseCommitBgColor, true)
|
|
markedBaseCommitFgTextStyle := GetTextStyle(themeConfig.MarkedBaseCommitFgColor, false)
|
|
MarkedBaseCommitTextStyle = markedBaseCommitBgTextStyle.MergeStyle(markedBaseCommitFgTextStyle)
|
|
|
|
unstagedChangesTextStyle := GetTextStyle(themeConfig.UnstagedChangesColor, false)
|
|
UnstagedChangesColor = unstagedChangesTextStyle
|
|
|
|
GocuiSelectedLineBgColor = GetGocuiStyle(themeConfig.SelectedLineBgColor)
|
|
OptionsColor = GetGocuiStyle(themeConfig.OptionsTextColor)
|
|
OptionsFgColor = GetTextStyle(themeConfig.OptionsTextColor, false)
|
|
|
|
DefaultTextColor = GetTextStyle(themeConfig.DefaultFgColor, false)
|
|
GocuiDefaultTextColor = GetGocuiStyle(themeConfig.DefaultFgColor)
|
|
}
|