go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-02-05 13:24:54 +02:00
Code Issues Releases Activity

move toggle whitespace action to controllers package

Browse Source
This commit is contained in:
Jesse Duffield 2023-03-26 16:00:40 +11:00
parent 2e32e55957
commit 0faa41e6f8
4 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/gui/controllers/global_controller.go
View File

@ -107,6 +107,11 @@ func (self *GlobalController) GetKeybindings(opts types.KeybindingsOpts) []*type
Modifier: gocui.ModNone,
Handler: self.escape,
},
{
Key: opts.GetKey(opts.Config.Universal.ToggleWhitespaceInDiffView),
Handler: self.toggleWhitespace,
Description: self.c.Tr.ToggleWhitespaceInDiffView,
},
}
}
@ -157,3 +162,7 @@ func (self *GlobalController) quitWithoutChangingDirectory() error {
func (self *GlobalController) escape() error {
return (&QuitActions{c: self.c}).Escape()
}
func (self *GlobalController) toggleWhitespace() error {
return (&ToggleWhitespaceAction{c: self.c}).Call()
}

21
pkg/gui/controllers/toggle_whitespace_action.go Normal file
View File

@ -0,0 +1,21 @@
package controllers
import (
"github.com/jesseduffield/lazygit/pkg/gui/types"
)
type ToggleWhitespaceAction struct {
c *ControllerCommon
}
func (self *ToggleWhitespaceAction) Call() error {
self.c.State().SetIgnoreWhitespaceInDiffView(!self.c.State().GetIgnoreWhitespaceInDiffView())
toastMessage := self.c.Tr.ShowingWhitespaceInDiffView
if self.c.State().GetIgnoreWhitespaceInDiffView() {
toastMessage = self.c.Tr.IgnoringWhitespaceInDiffView
}
self.c.Toast(toastMessage)
return self.c.CurrentSideContext().HandleFocus(types.OnFocusOpts{})
}

6
pkg/gui/keybindings.go
View File

@ -258,12 +258,6 @@ func (self *Gui) GetInitialKeybindings() ([]*types.Binding, []*gocui.ViewMouseBi
Handler: self.handleCopySelectedSideContextItemToClipboard,
Description: self.c.Tr.LcCopySubmoduleNameToClipboard,
},
{
ViewName: "",
Key: opts.GetKey(opts.Config.Universal.ToggleWhitespaceInDiffView),
Handler: self.toggleWhitespaceInDiffView,
Description: self.c.Tr.ToggleWhitespaceInDiffView,
},
{
ViewName: "extras",
Key: gocui.MouseWheelUp,

17
pkg/gui/whitespace-toggle.go
View File

@ -1,17 +0,0 @@
package gui
import (
"github.com/jesseduffield/lazygit/pkg/gui/types"
)
func (gui *Gui) toggleWhitespaceInDiffView() error {
gui.IgnoreWhitespaceInDiffView = !gui.IgnoreWhitespaceInDiffView
toastMessage := gui.c.Tr.ShowingWhitespaceInDiffView
if gui.IgnoreWhitespaceInDiffView {
toastMessage = gui.c.Tr.IgnoringWhitespaceInDiffView
}
gui.c.Toast(toastMessage)
return gui.c.CurrentSideContext().HandleFocus(types.OnFocusOpts{})
}