go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-08-08 22:36:49 +02:00
Code Issues Releases Activity

Make conditions easier to understand

Browse Source 
This doesn't change behavior, just makes the code a little bit easier to
understand: the outermost condition is "do we show a popup and is the mouse
event for some other view than the focused one". Only if that's true do we need
to define the isCommitMessageView function, and check whether both views belong
to the commit message editor.
This commit is contained in:
Stefan Haller
2025-07-10 15:06:30 +02:00
parent 4a6041f3ce
commit 2e5cf46716
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/gui/keybindings.go
View File

@ -504,16 +504,17 @@ func (gui *Gui) SetKeybinding(binding *types.Binding) error {
func (gui *Gui) SetMouseKeybinding(binding *gocui.ViewMouseBinding) error { func (gui *Gui) SetMouseKeybinding(binding *gocui.ViewMouseBinding) error {
baseHandler := binding.Handler baseHandler := binding.Handler
newHandler := func(opts gocui.ViewMouseBindingOpts) error { newHandler := func(opts gocui.ViewMouseBindingOpts) error {
if gui.helpers.Confirmation.IsPopupPanelFocused() && gui.currentViewName() != binding.ViewName {
// we ignore click events on views that aren't popup panels, when a popup panel is focused. // we ignore click events on views that aren't popup panels, when a popup panel is focused.
// Unless both the current view and the clicked-on view are either commit message or commit // Unless both the current view and the clicked-on view are either commit message or commit
// description, because we want to allow switching between those two views by clicking. // description, because we want to allow switching between those two views by clicking.
isCommitMessageView := func(viewName string) bool { isCommitMessageView := func(viewName string) bool {
return viewName == "commitMessage" || viewName == "commitDescription" return viewName == "commitMessage" || viewName == "commitDescription"
} }
if gui.helpers.Confirmation.IsPopupPanelFocused() && gui.currentViewName() != binding.ViewName && if !isCommitMessageView(gui.currentViewName()) || !isCommitMessageView(binding.ViewName) {
(!isCommitMessageView(gui.currentViewName()) || !isCommitMessageView(binding.ViewName)) {
return nil return nil
} }
}
return baseHandler(opts) return baseHandler(opts)
} }