sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-31 14:24:25 +03:00
Code Activity

Remove return value of Focus-related functions

Browse Source
This commit is contained in:
Stefan Haller
2024-09-04 14:26:15 +02:00
parent 8edcd71234
commit 8302575078
24 changed files with 73 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/gui/controllers/merge_conflicts_controller.go
View File

@ -147,25 +147,21 @@ func (self *MergeConflictsController) GetMouseKeybindings(opts types.Keybindings
}
}
func (self *MergeConflictsController) GetOnFocus() func(types.OnFocusOpts) error {
return func(types.OnFocusOpts) error {
func (self *MergeConflictsController) GetOnFocus() func(types.OnFocusOpts) {
return func(types.OnFocusOpts) {
self.c.Views().MergeConflicts.Wrap = false
self.c.Helpers().MergeConflicts.Render()
self.context().SetSelectedLineRange()
return nil
}
}
func (self *MergeConflictsController) GetOnFocusLost() func(types.OnFocusLostOpts) error {
return func(types.OnFocusLostOpts) error {
func (self *MergeConflictsController) GetOnFocusLost() func(types.OnFocusLostOpts) {
return func(types.OnFocusLostOpts) {
self.context().SetUserScrolling(false)
self.context().GetState().ResetConflictSelection()
self.c.Views().MergeConflicts.Wrap = true
return nil
}
}