update view cursor when selecting new line in patch explorer view

pkg/gui/context/base_context.go

@@ -20,6 +20,7 @@ type BaseContext struct {
 	focusable           bool
 	transient           bool
 	hasControlledBounds bool
+	highlightOnFocus    bool
 
 	*ParentContextMgr
 }
@@ -34,6 +35,7 @@ type NewBaseContextOpts struct {
 	Focusable             bool
 	Transient             bool
 	HasUncontrolledBounds bool // negating for the sake of making false the default
+	HighlightOnFocus      bool
 
 	OnGetOptionsMap func() map[string]string
 }
@@ -52,6 +54,7 @@ func NewBaseContext(opts NewBaseContextOpts) *BaseContext {
 		focusable:           opts.Focusable,
 		transient:           opts.Transient,
 		hasControlledBounds: hasControlledBounds,
+		highlightOnFocus:    opts.HighlightOnFocus,
 		ParentContextMgr:    &ParentContextMgr{},
 		viewTrait:           viewTrait,
 	}

pkg/gui/context/merge_conflicts_context.go

@@ -42,12 +42,13 @@ func NewMergeConflictsContext(
 		mutex:     &deadlock.Mutex{},
 		Context: NewSimpleContext(
 			NewBaseContext(NewBaseContextOpts{
-				Kind:            types.MAIN_CONTEXT,
-				View:            view,
-				WindowName:      "main",
-				Key:             MERGE_CONFLICTS_CONTEXT_KEY,
-				OnGetOptionsMap: getOptionsMap,
-				Focusable:       true,
+				Kind:             types.MAIN_CONTEXT,
+				View:             view,
+				WindowName:       "main",
+				Key:              MERGE_CONFLICTS_CONTEXT_KEY,
+				OnGetOptionsMap:  getOptionsMap,
+				Focusable:        true,
+				HighlightOnFocus: true,
 			}),
 			opts,
 		),
@@ -77,7 +78,7 @@ func (self *MergeConflictsContext) IsUserScrolling() bool {
 
 func (self *MergeConflictsContext) RenderAndFocus(isFocused bool) error {
 	self.setContent(isFocused)
-	self.focusSelection()
+	self.FocusSelection()
 
 	self.c.Render()
 
@@ -104,9 +105,9 @@ func (self *MergeConflictsContext) setContent(isFocused bool) {
 	self.GetView().SetContent(self.GetContentToRender(isFocused))
 }
 
-func (self *MergeConflictsContext) focusSelection() {
+func (self *MergeConflictsContext) FocusSelection() {
 	if !self.IsUserScrolling() {
-		_ = self.GetView().SetOrigin(self.GetView().OriginX(), self.GetOriginY())
+		_ = self.GetView().SetOriginY(self.GetOriginY())
 	}
 }
 

pkg/gui/context/patch_explorer_context.go

@@ -37,11 +37,12 @@ func NewPatchExplorerContext(
 		mutex:                  &deadlock.Mutex{},
 		getIncludedLineIndices: getIncludedLineIndices,
 		SimpleContext: NewSimpleContext(NewBaseContext(NewBaseContextOpts{
-			View:       view,
-			WindowName: windowName,
-			Key:        key,
-			Kind:       types.MAIN_CONTEXT,
-			Focusable:  true,
+			View:             view,
+			WindowName:       windowName,
+			Key:              key,
+			Kind:             types.MAIN_CONTEXT,
+			Focusable:        true,
+			HighlightOnFocus: true,
 		}), ContextCallbackOpts{
 			OnFocus:     onFocus,
 			OnFocusLost: onFocusLost,
@@ -68,7 +69,7 @@ func (self *PatchExplorerContext) GetIncludedLineIndices() []int {
 func (self *PatchExplorerContext) RenderAndFocus(isFocused bool) error {
 	self.setContent(isFocused)
 
-	self.focusSelection()
+	self.FocusSelection()
 	self.c.Render()
 
 	return nil
@@ -83,7 +84,7 @@ func (self *PatchExplorerContext) Render(isFocused bool) error {
 }
 
 func (self *PatchExplorerContext) Focus() error {
-	self.focusSelection()
+	self.FocusSelection()
 	self.c.Render()
 
 	return nil
@@ -93,16 +94,18 @@ func (self *PatchExplorerContext) setContent(isFocused bool) {
 	self.GetView().SetContent(self.GetContentToRender(isFocused))
 }
 
-func (self *PatchExplorerContext) focusSelection() {
+func (self *PatchExplorerContext) FocusSelection() {
 	view := self.GetView()
 	state := self.GetState()
 	_, viewHeight := view.Size()
 	bufferHeight := viewHeight - 1
 	_, origin := view.Origin()
 
-	newOrigin := state.CalculateOrigin(origin, bufferHeight)
+	newOriginY := state.CalculateOrigin(origin, bufferHeight)
 
-	_ = view.SetOriginY(newOrigin)
+	_ = view.SetOriginY(newOriginY)
+
+	view.SetCursorY(state.GetSelectedLineIdx() - newOriginY)
 }
 
 func (self *PatchExplorerContext) GetContentToRender(isFocused bool) string {

pkg/gui/context/simple_context.go

@@ -50,6 +50,10 @@ func NewDisplayContext(key types.ContextKey, view *gocui.View, windowName string
 }
 
 func (self *SimpleContext) HandleFocus(opts types.OnFocusOpts) error {
+	if self.highlightOnFocus {
+		self.GetViewTrait().SetHighlight(true)
+	}
+
 	if self.OnFocus != nil {
 		if err := self.OnFocus(opts); err != nil {
 			return err

pkg/gui/refresh.go

@@ -618,6 +618,12 @@ func (gui *Gui) refreshStagingPanel(focusOpts types.OnFocusOpts) error {
 		return gui.c.PushContext(mainContext, focusOpts)
 	}
 
+	if secondaryFocused {
+		gui.State.Contexts.StagingSecondary.FocusSelection()
+	} else {
+		gui.State.Contexts.Staging.FocusSelection()
+	}
+
 	return gui.c.RenderToMainViews(types.RefreshMainOpts{
 		Pair: gui.c.MainViewPairs().Staging,
 		Main: &types.ViewUpdateOpts{
@@ -679,6 +685,8 @@ func (gui *Gui) refreshPatchBuildingPanel(opts types.OnFocusOpts) error {
 		return gui.helpers.PatchBuilding.Escape()
 	}
 
+	gui.State.Contexts.CustomPatchBuilder.FocusSelection()
+
 	mainContent := context.GetContentToRender(true)
 
 	return gui.c.RenderToMainViews(types.RefreshMainOpts{