Fix wrong highlight in staging panel when entering file with only sta…

…ged changes (#3667) Reproduction recipe: 1. stage all changes in a file by pressing space on it in the files panel 2. enter the staged changes panel by pressing enter 3. unstage one of the changes This makes the unstaged changes panel visible, but keeps the focus in the staged changes panel. However, the highlight in the unstaged changes view becomes visible, as if it were focused. Fixes #3664
jesseduffield · Jun 23, 2024 · 2ccd998 · 2ccd998
2 parents cf40a5b + db0a158
commit 2ccd998
Show file tree

Hide file tree

Showing 14 changed files with 63 additions and 46 deletions.
diff --git a/docs/Config.md b/docs/Config.md
@@ -122,6 +122,10 @@ gui:
  selectedLineBgColor:
  - blue
 
+ # Background color of selected line when view doesn't have focus.
+ inactiveViewSelectedLineBgColor:
+ - bold
+
  # Foreground color of copied commit
  cherryPickedCommitFgColor:
  - blue

diff --git a/go.mod b/go.mod
@@ -16,7 +16,7 @@ require (
  github.com/integrii/flaggy v1.4.0
  github.com/jesseduffield/generics v0.0.0-20220320043834-727e535cbe68
  github.com/jesseduffield/go-git/v5 v5.1.2-0.20221018185014-fdd53fef665d
- github.com/jesseduffield/gocui v0.3.1-0.20240623095254-05e1204c2454
+ github.com/jesseduffield/gocui v0.3.1-0.20240623124136-ce5274be521d
  github.com/jesseduffield/kill v0.0.0-20220618033138-bfbe04675d10
  github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5
  github.com/jesseduffield/minimal/gitignore v0.3.3-0.20211018110810-9cde264e6b1e

diff --git a/go.sum b/go.sum
@@ -188,8 +188,8 @@ github.com/jesseduffield/generics v0.0.0-20220320043834-727e535cbe68 h1:EQP2Tv8T
 github.com/jesseduffield/generics v0.0.0-20220320043834-727e535cbe68/go.mod h1:+LLj9/WUPAP8LqCchs7P+7X0R98HiFujVFANdNaxhGk=
 github.com/jesseduffield/go-git/v5 v5.1.2-0.20221018185014-fdd53fef665d h1:bO+OmbreIv91rCe8NmscRwhFSqkDJtzWCPV4Y+SQuXE=
 github.com/jesseduffield/go-git/v5 v5.1.2-0.20221018185014-fdd53fef665d/go.mod h1:nGNEErzf+NRznT+N2SWqmHnDnF9aLgANB1CUNEan09o=
-github.com/jesseduffield/gocui v0.3.1-0.20240623095254-05e1204c2454 h1:rTPA5WiPM1SPUA3r2kSb3RiILC93am6irMvOLjO7JNA=
-github.com/jesseduffield/gocui v0.3.1-0.20240623095254-05e1204c2454/go.mod h1:XtEbqCbn45keRXEu+OMZkjN5gw6AEob59afsgHjokZ8=
+github.com/jesseduffield/gocui v0.3.1-0.20240623124136-ce5274be521d h1:I6rViLB+ZW5SnS8P7ZE0FdY6lMfx803qZ9ZYEYCvfro=
+github.com/jesseduffield/gocui v0.3.1-0.20240623124136-ce5274be521d/go.mod h1:XtEbqCbn45keRXEu+OMZkjN5gw6AEob59afsgHjokZ8=
 github.com/jesseduffield/kill v0.0.0-20220618033138-bfbe04675d10 h1:jmpr7KpX2+2GRiE91zTgfq49QvgiqB0nbmlwZ8UnOx0=
 github.com/jesseduffield/kill v0.0.0-20220618033138-bfbe04675d10/go.mod h1:aA97kHeNA+sj2Hbki0pvLslmE4CbDyhBeSSTUUnOuVo=
 github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5 h1:CDuQmfOjAtb1Gms6a1p5L2P8RhbLUq5t8aL7PiQd2uY=

diff --git a/pkg/config/user_config.go b/pkg/config/user_config.go
@@ -179,6 +179,8 @@ type ThemeConfig struct {
  // Background color of selected line.
  // See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#highlighting-the-selected-line
  SelectedLineBgColor []string `yaml:"selectedLineBgColor" jsonschema:"minItems=1,uniqueItems=true"`
+ // Background color of selected line when view doesn't have focus.
+ InactiveViewSelectedLineBgColor []string `yaml:"inactiveViewSelectedLineBgColor" jsonschema:"minItems=1,uniqueItems=true"`
  // Foreground color of copied commit
  CherryPickedCommitFgColor []string `yaml:"cherryPickedCommitFgColor" jsonschema:"minItems=1,uniqueItems=true"`
  // Background color of copied commit
@@ -668,17 +670,18 @@ func GetDefaultConfig() *UserConfig {
  TimeFormat: "02 Jan 06",
  ShortTimeFormat: time.Kitchen,
  Theme: ThemeConfig{
- ActiveBorderColor: []string{"green", "bold"},
- SearchingActiveBorderColor: []string{"cyan", "bold"},
- InactiveBorderColor: []string{"default"},
- OptionsTextColor: []string{"blue"},
- SelectedLineBgColor: []string{"blue"},
- CherryPickedCommitBgColor: []string{"cyan"},
- CherryPickedCommitFgColor: []string{"blue"},
- MarkedBaseCommitBgColor: []string{"yellow"},
- MarkedBaseCommitFgColor: []string{"blue"},
- UnstagedChangesColor: []string{"red"},
- DefaultFgColor: []string{"default"},
+ ActiveBorderColor: []string{"green", "bold"},
+ SearchingActiveBorderColor: []string{"cyan", "bold"},
+ InactiveBorderColor: []string{"default"},
+ OptionsTextColor: []string{"blue"},
+ SelectedLineBgColor: []string{"blue"},
+ InactiveViewSelectedLineBgColor: []string{"bold"},
+ CherryPickedCommitBgColor: []string{"cyan"},
+ CherryPickedCommitFgColor: []string{"blue"},
+ MarkedBaseCommitBgColor: []string{"yellow"},
+ MarkedBaseCommitFgColor: []string{"blue"},
+ UnstagedChangesColor: []string{"red"},
+ DefaultFgColor: []string{"default"},
  },
  CommitAuthorFormat: "auto",
  CommitLength: CommitLengthConfig{Show: true},

diff --git a/pkg/gui/context.go b/pkg/gui/context.go
@@ -230,6 +230,10 @@ func (self *ContextMgr) ActivateContext(c types.Context, opts types.OnFocusOpts)
  self.gui.helpers.Window.SetWindowContext(c)
 
  self.gui.helpers.Window.MoveToTopOfWindow(c)
+ oldView := self.gui.c.GocuiGui().CurrentView()
+ if oldView != nil && oldView.Name() != viewName {
+ oldView.HighlightInactive = true
+ }
  if _, err := self.gui.c.GocuiGui().SetCurrentView(viewName); err != nil {
  return err
  }

diff --git a/pkg/gui/context/simple_context.go b/pkg/gui/context/simple_context.go
@@ -52,6 +52,8 @@ func (self *SimpleContext) HandleFocus(opts types.OnFocusOpts) error {
 }
 
 func (self *SimpleContext) HandleFocusLost(opts types.OnFocusLostOpts) error {
+ self.GetViewTrait().SetHighlight(false)
+ _ = self.view.SetOriginX(0)
  if self.onFocusLostFn != nil {
  return self.onFocusLostFn(opts)
  }

diff --git a/pkg/gui/context/view_trait.go b/pkg/gui/context/view_trait.go
@@ -49,6 +49,7 @@ func (self *ViewTrait) SetContent(content string) {
 
 func (self *ViewTrait) SetHighlight(highlight bool) {
  self.view.Highlight = highlight
+ self.view.HighlightInactive = false
 }
 
 func (self *ViewTrait) SetFooter(value string) {

diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go
@@ -678,7 +678,7 @@ func (gui *Gui) Run(startArgs appTypes.StartArgs) error {
  return err
  }
 
- gui.g.SetManager(gocui.ManagerFunc(gui.layout), gocui.ManagerFunc(gui.getFocusLayout()))
+ gui.g.SetManager(gocui.ManagerFunc(gui.layout))
 
  if err := gui.createAllViews(); err != nil {
  return err

diff --git a/pkg/gui/layout.go b/pkg/gui/layout.go
@@ -288,35 +288,6 @@ func (gui *Gui) onInitialViewsCreation() error {
  return nil
 }
 
-// getFocusLayout returns a manager function for when view gain and lose focus
-func (gui *Gui) getFocusLayout() func(g *gocui.Gui) error {
- var previousView *gocui.View
- return func(g *gocui.Gui) error {
- newView := gui.g.CurrentView()
- // for now we don't consider losing focus to a popup panel as actually losing focus
- if newView != previousView && !gui.helpers.Confirmation.IsPopupPanel(newView.Name()) {
- if err := gui.onViewFocusLost(previousView); err != nil {
- return err
- }
-
- previousView = newView
- }
- return nil
- }
-}
-
-func (gui *Gui) onViewFocusLost(oldView *gocui.View) error {
- if oldView == nil {
- return nil
- }
-
- oldView.Highlight = false
-
- _ = oldView.SetOriginX(0)
-
- return nil
-}
-
 func (gui *Gui) transientContexts() []types.Context {
  return lo.Filter(gui.State.Contexts.Flatten(), func(context types.Context, _ int) bool {
  return context.IsTransient()

diff --git a/pkg/gui/views.go b/pkg/gui/views.go
@@ -92,6 +92,7 @@ func (gui *Gui) createAllViews() error {
  (*mapping.viewPtr).FrameRunes = frameRunes
  (*mapping.viewPtr).FgColor = theme.GocuiDefaultTextColor
  (*mapping.viewPtr).SelBgColor = theme.GocuiSelectedLineBgColor
+ (*mapping.viewPtr).InactiveViewSelBgColor = theme.GocuiInactiveViewSelectedLineBgColor
  }
 
  gui.Views.Options.Frame = false

diff --git a/pkg/theme/theme.go b/pkg/theme/theme.go
@@ -24,11 +24,15 @@ var (
 
  // GocuiSelectedLineBgColor is the background color for the selected line in gocui
  GocuiSelectedLineBgColor gocui.Attribute
+ // GocuiInactiveViewSelectedLineBgColor is the background color for the selected line in gocui if the view doesn't have focus
+ GocuiInactiveViewSelectedLineBgColor gocui.Attribute
 
  OptionsColor gocui.Attribute
 
  // SelectedLineBgColor is the background color for the selected line
  SelectedLineBgColor = style.New()
+ // InactiveViewSelectedLineBgColor is the background color for the selected line if the view doesn't have the focus
+ InactiveViewSelectedLineBgColor = style.New()
 
  // CherryPickedCommitColor is the text style when cherry picking a commit
  CherryPickedCommitTextStyle = style.New()
@@ -49,6 +53,7 @@ func UpdateTheme(themeConfig config.ThemeConfig) {
  InactiveBorderColor = GetGocuiStyle(themeConfig.InactiveBorderColor)
  SearchingActiveBorderColor = GetGocuiStyle(themeConfig.SearchingActiveBorderColor)
  SelectedLineBgColor = GetTextStyle(themeConfig.SelectedLineBgColor, true)
+ InactiveViewSelectedLineBgColor = GetTextStyle(themeConfig.InactiveViewSelectedLineBgColor, true)
 
  cherryPickedCommitBgTextStyle := GetTextStyle(themeConfig.CherryPickedCommitBgColor, true)
  cherryPickedCommitFgTextStyle := GetTextStyle(themeConfig.CherryPickedCommitFgColor, false)
@@ -62,6 +67,7 @@ func UpdateTheme(themeConfig config.ThemeConfig) {
  UnstagedChangesColor = unstagedChangesTextStyle
 
  GocuiSelectedLineBgColor = GetGocuiStyle(themeConfig.SelectedLineBgColor)
+ GocuiInactiveViewSelectedLineBgColor = GetGocuiStyle(themeConfig.InactiveViewSelectedLineBgColor)
  OptionsColor = GetGocuiStyle(themeConfig.OptionsTextColor)
  OptionsFgColor = GetTextStyle(themeConfig.OptionsTextColor, false)
 

diff --git a/schema/config.json b/schema/config.json
@@ -186,6 +186,18 @@
  "blue"
  ]
  },
+ "inactiveViewSelectedLineBgColor": {
+ "items": {
+ "type": "string"
+ },
+ "type": "array",
+ "minItems": 1,
+ "uniqueItems": true,
+ "description": "Background color of selected line when view doesn't have focus.",
+ "default": [
+ "bold"
+ ]
+ },
  "cherryPickedCommitFgColor": {
  "items": {
  "type": "string"

diff --git a/vendor/github.com/jesseduffield/gocui/view.go b/vendor/github.com/jesseduffield/gocui/view.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -172,7 +172,7 @@ github.com/jesseduffield/go-git/v5/utils/merkletrie/filesystem
 github.com/jesseduffield/go-git/v5/utils/merkletrie/index
 github.com/jesseduffield/go-git/v5/utils/merkletrie/internal/frame
 github.com/jesseduffield/go-git/v5/utils/merkletrie/noder
-# github.com/jesseduffield/gocui v0.3.1-0.20240623095254-05e1204c2454
+# github.com/jesseduffield/gocui v0.3.1-0.20240623124136-ce5274be521d
 ## explicit; go 1.12
 github.com/jesseduffield/gocui
 # github.com/jesseduffield/kill v0.0.0-20220618033138-bfbe04675d10