Skip to content

Commit 2d897e1

Browse files
committed
Add DisabledReason for rebase options when not rebasing or merging
1 parent 78eb6ce commit 2d897e1

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

Diff for: pkg/gui/controllers/global_controller.go

+15-5
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,12 @@ func (self *GlobalController) GetKeybindings(opts types.KeybindingsOpts) []*type
3535
OpensMenu: true,
3636
},
3737
{
38-
Key: opts.GetKey(opts.Config.Universal.CreateRebaseOptionsMenu),
39-
Handler: opts.Guards.NoPopupPanel(self.c.Helpers().MergeAndRebase.CreateRebaseOptionsMenu),
40-
Description: self.c.Tr.ViewMergeRebaseOptions,
41-
Tooltip: self.c.Tr.ViewMergeRebaseOptionsTooltip,
42-
OpensMenu: true,
38+
Key: opts.GetKey(opts.Config.Universal.CreateRebaseOptionsMenu),
39+
Handler: opts.Guards.NoPopupPanel(self.c.Helpers().MergeAndRebase.CreateRebaseOptionsMenu),
40+
Description: self.c.Tr.ViewMergeRebaseOptions,
41+
Tooltip: self.c.Tr.ViewMergeRebaseOptionsTooltip,
42+
OpensMenu: true,
43+
GetDisabledReason: self.canShowRebaseOptions,
4344
},
4445
{
4546
Key: opts.GetKey(opts.Config.Universal.Refresh),
@@ -191,3 +192,12 @@ func (self *GlobalController) escape() error {
191192
func (self *GlobalController) toggleWhitespace() error {
192193
return (&ToggleWhitespaceAction{c: self.c}).Call()
193194
}
195+
196+
func (self *GlobalController) canShowRebaseOptions() *types.DisabledReason {
197+
if self.c.Model().WorkingTreeStateAtLastCommitRefresh.None() {
198+
return &types.DisabledReason{
199+
Text: self.c.Tr.NotMergingOrRebasing,
200+
}
201+
}
202+
return nil
203+
}

0 commit comments

Comments
 (0)