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

Add DisabledReason for rebase options when not rebasing or merging

Browse Source
This commit is contained in:
Stefan Haller
2024-06-11 13:37:55 +02:00
parent 3e5024480d
commit 90db796f42
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,11 +35,12 @@ func (self *GlobalController) GetKeybindings(opts types.KeybindingsOpts) []*type
OpensMenu: true, OpensMenu: true,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.CreateRebaseOptionsMenu), Key: opts.GetKey(opts.Config.Universal.CreateRebaseOptionsMenu),
Handler: opts.Guards.NoPopupPanel(self.c.Helpers().MergeAndRebase.CreateRebaseOptionsMenu), Handler: opts.Guards.NoPopupPanel(self.c.Helpers().MergeAndRebase.CreateRebaseOptionsMenu),
Description: self.c.Tr.ViewMergeRebaseOptions, Description: self.c.Tr.ViewMergeRebaseOptions,
Tooltip: self.c.Tr.ViewMergeRebaseOptionsTooltip, Tooltip: self.c.Tr.ViewMergeRebaseOptionsTooltip,
OpensMenu: true, OpensMenu: true,
GetDisabledReason: self.canShowRebaseOptions,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.Refresh), Key: opts.GetKey(opts.Config.Universal.Refresh),
@ -191,3 +192,12 @@ func (self *GlobalController) escape() error {
func (self *GlobalController) toggleWhitespace() error { func (self *GlobalController) toggleWhitespace() error {
return (&ToggleWhitespaceAction{c: self.c}).Call() return (&ToggleWhitespaceAction{c: self.c}).Call()
} }
func (self *GlobalController) canShowRebaseOptions() *types.DisabledReason {
if self.c.Model().WorkingTreeStateAtLastCommitRefresh.None() {
return &types.DisabledReason{
Text: self.c.Tr.NotMergingOrRebasing,
}
}
return nil
}