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

Fix clicking in status side panel

Browse Source 
Seems to have been broken since that big refactoring in March 23.
This commit is contained in:
Stefan Haller
2024-05-03 21:25:20 +02:00
parent ac0524f7cb
commit 88e7c44552
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/gui/controllers/status_controller.go
View File

@ -75,6 +75,11 @@ func (self *StatusController) GetMouseKeybindings(opts types.KeybindingsOpts) []
Key: gocui.MouseLeft, Key: gocui.MouseLeft,
Handler: self.onClickMain, Handler: self.onClickMain,
}, },
{
ViewName: self.Context().GetViewName(),
Key: gocui.MouseLeft,
Handler: self.onClick,
},
} }
} }
@ -95,15 +100,11 @@ func (self *StatusController) GetOnRenderToMain() func() error {
} }
} }
func (self *StatusController) GetOnClick() func() error {
return self.onClick
}
func (self *StatusController) Context() types.Context { func (self *StatusController) Context() types.Context {
return self.c.Contexts().Status return self.c.Contexts().Status
} }
func (self *StatusController) onClick() error { func (self *StatusController) onClick(opts gocui.ViewMouseBindingOpts) error {
// TODO: move into some abstraction (status is currently not a listViewContext where a lot of this code lives) // TODO: move into some abstraction (status is currently not a listViewContext where a lot of this code lives)
currentBranch := self.c.Helpers().Refs.GetCheckedOutRef() currentBranch := self.c.Helpers().Refs.GetCheckedOutRef()
if currentBranch == nil { if currentBranch == nil {
@ -115,21 +116,20 @@ func (self *StatusController) onClick() error {
return err return err
} }
cx, _ := self.c.Views().Status.Cursor()
upstreamStatus := presentation.BranchStatus(currentBranch, types.ItemOperationNone, self.c.Tr, time.Now(), self.c.UserConfig) upstreamStatus := presentation.BranchStatus(currentBranch, types.ItemOperationNone, self.c.Tr, time.Now(), self.c.UserConfig)
repoName := self.c.Git().RepoPaths.RepoName() repoName := self.c.Git().RepoPaths.RepoName()
workingTreeState := self.c.Git().Status.WorkingTreeState() workingTreeState := self.c.Git().Status.WorkingTreeState()
switch workingTreeState { switch workingTreeState {
case enums.REBASE_MODE_REBASING, enums.REBASE_MODE_MERGING: case enums.REBASE_MODE_REBASING, enums.REBASE_MODE_MERGING:
workingTreeStatus := fmt.Sprintf("(%s)", presentation.FormatWorkingTreeStateLower(self.c.Tr, workingTreeState)) workingTreeStatus := fmt.Sprintf("(%s)", presentation.FormatWorkingTreeStateLower(self.c.Tr, workingTreeState))
if cursorInSubstring(cx, upstreamStatus+" ", workingTreeStatus) { if cursorInSubstring(opts.X, upstreamStatus+" ", workingTreeStatus) {
return self.c.Helpers().MergeAndRebase.CreateRebaseOptionsMenu() return self.c.Helpers().MergeAndRebase.CreateRebaseOptionsMenu()
} }
if cursorInSubstring(cx, upstreamStatus+" "+workingTreeStatus+" ", repoName) { if cursorInSubstring(opts.X, upstreamStatus+" "+workingTreeStatus+" ", repoName) {
return self.c.Helpers().Repos.CreateRecentReposMenu() return self.c.Helpers().Repos.CreateRecentReposMenu()
} }
default: default:
if cursorInSubstring(cx, upstreamStatus+" ", repoName) { if cursorInSubstring(opts.X, upstreamStatus+" ", repoName) {
return self.c.Helpers().Repos.CreateRecentReposMenu() return self.c.Helpers().Repos.CreateRecentReposMenu()
} }
} }