mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-04-23 12:18:51 +02:00
Original commit message of the gocui change: This fixes View.Size, Width and Height to be the correct (outer) size of a view including its frame, and InnerSize/InnerWidth/InnerHeight to be the usable client area exluding the frame. Previously, Size was actually the InnerSize (and a lot of client code used it as such, so these need to be changed to InnerSize). InnerSize, on the other hand, was *one* less than Size (not two, as you would have expected), and in many cases this was made up for at call sites by adding 1 (e.g. in calcRealScrollbarStartEnd, parseInput, and many other places in the lazygit code). There are still some weird things left that I didn't address here: - a view's lower-right coordinates (x1/y1) are one less than you would expect. For example, a view with a 2x2 client area like this: ╭──╮ │ab│ │cd│ ╰──╯ in the top-left corner of the screen (x0 and y0 both zero) has x1/xy at 3, not 4 as would be more natural. - a view without a frame has its coordinates extended by 1 on all sides; to illustrate, the same 2x2 view as before but without a frame, sitting in the top-left corder of the screen, has coordinates x0=-1, y0=-1, x1=2, y1=2. This is highly confusing and unexpected. I left these as they are because they would be even more of a breaking change, and also because they don't have quite as much of an impact on general app code.
149 lines
4.7 KiB
Go
149 lines
4.7 KiB
Go
package gui
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/jesseduffield/lazygit/pkg/gui/context"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/keybindings"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/style"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/types"
|
|
"github.com/jesseduffield/lazygit/pkg/theme"
|
|
"github.com/jesseduffield/lazygit/pkg/utils"
|
|
"github.com/samber/lo"
|
|
)
|
|
|
|
type OptionsMapMgr struct {
|
|
c *helpers.HelperCommon
|
|
}
|
|
|
|
func (gui *Gui) renderContextOptionsMap() {
|
|
// In demos, we render our own content to this view
|
|
if gui.integrationTest != nil && gui.integrationTest.IsDemo() {
|
|
return
|
|
}
|
|
mgr := OptionsMapMgr{c: gui.c}
|
|
mgr.renderContextOptionsMap()
|
|
}
|
|
|
|
// Render the options available for the current context at the bottom of the screen
|
|
// STYLE GUIDE: we use the default options fg color for most keybindings. We can
|
|
// only use a different color if we're in a specific mode where the user is likely
|
|
// to want to press that key. For example, when in cherry-picking mode, we
|
|
// want to prominently show the keybinding for pasting commits.
|
|
func (self *OptionsMapMgr) renderContextOptionsMap() {
|
|
currentContext := self.c.Context().Current()
|
|
|
|
currentContextBindings := currentContext.GetKeybindings(self.c.KeybindingsOpts())
|
|
globalBindings := self.c.Contexts().Global.GetKeybindings(self.c.KeybindingsOpts())
|
|
|
|
allBindings := append(currentContextBindings, globalBindings...)
|
|
|
|
bindingsToDisplay := lo.Filter(allBindings, func(binding *types.Binding, _ int) bool {
|
|
return binding.DisplayOnScreen && !binding.IsDisabled()
|
|
})
|
|
|
|
optionsMap := lo.Map(bindingsToDisplay, func(binding *types.Binding, _ int) bindingInfo {
|
|
displayStyle := theme.OptionsFgColor
|
|
if binding.DisplayStyle != nil {
|
|
displayStyle = *binding.DisplayStyle
|
|
}
|
|
|
|
description := binding.Description
|
|
if binding.ShortDescription != "" {
|
|
description = binding.ShortDescription
|
|
}
|
|
|
|
return bindingInfo{
|
|
key: keybindings.LabelFromKey(binding.Key),
|
|
description: description,
|
|
style: displayStyle,
|
|
}
|
|
})
|
|
|
|
// Mode-specific local keybindings
|
|
if currentContext.GetKey() == context.LOCAL_COMMITS_CONTEXT_KEY {
|
|
if self.c.Modes().CherryPicking.Active() {
|
|
optionsMap = utils.Prepend(optionsMap, bindingInfo{
|
|
key: keybindings.Label(self.c.KeybindingsOpts().Config.Commits.PasteCommits),
|
|
description: self.c.Tr.PasteCommits,
|
|
style: style.FgCyan,
|
|
})
|
|
}
|
|
|
|
if self.c.Model().BisectInfo.Started() {
|
|
optionsMap = utils.Prepend(optionsMap, bindingInfo{
|
|
key: keybindings.Label(self.c.KeybindingsOpts().Config.Commits.ViewBisectOptions),
|
|
description: self.c.Tr.ViewBisectOptions,
|
|
style: style.FgGreen,
|
|
})
|
|
}
|
|
}
|
|
|
|
// Mode-specific global keybindings
|
|
if self.c.Model().WorkingTreeStateAtLastCommitRefresh.IsRebasing() {
|
|
optionsMap = utils.Prepend(optionsMap, bindingInfo{
|
|
key: keybindings.Label(self.c.KeybindingsOpts().Config.Universal.CreateRebaseOptionsMenu),
|
|
description: self.c.Tr.ViewRebaseOptions,
|
|
style: style.FgYellow,
|
|
})
|
|
} else if self.c.Model().WorkingTreeStateAtLastCommitRefresh.IsMerging() {
|
|
optionsMap = utils.Prepend(optionsMap, bindingInfo{
|
|
key: keybindings.Label(self.c.KeybindingsOpts().Config.Universal.CreateRebaseOptionsMenu),
|
|
description: self.c.Tr.ViewMergeOptions,
|
|
style: style.FgYellow,
|
|
})
|
|
}
|
|
|
|
if self.c.Git().Patch.PatchBuilder.Active() {
|
|
optionsMap = utils.Prepend(optionsMap, bindingInfo{
|
|
key: keybindings.Label(self.c.KeybindingsOpts().Config.Universal.CreatePatchOptionsMenu),
|
|
description: self.c.Tr.ViewPatchOptions,
|
|
style: style.FgYellow,
|
|
})
|
|
}
|
|
|
|
self.renderOptions(self.formatBindingInfos(optionsMap))
|
|
}
|
|
|
|
func (self *OptionsMapMgr) formatBindingInfos(bindingInfos []bindingInfo) string {
|
|
width := self.c.Views().Options.InnerWidth() - 2 // -2 for some padding
|
|
var builder strings.Builder
|
|
ellipsis := "…"
|
|
separator := " | "
|
|
|
|
length := 0
|
|
|
|
for i, info := range bindingInfos {
|
|
plainText := fmt.Sprintf("%s: %s", info.description, info.key)
|
|
|
|
// Check if adding the next formatted string exceeds the available width
|
|
if i > 0 && length+len(separator)+len(plainText) > width {
|
|
builder.WriteString(theme.OptionsFgColor.Sprint(separator + ellipsis))
|
|
break
|
|
}
|
|
|
|
formatted := info.style.Sprintf(plainText)
|
|
|
|
if i > 0 {
|
|
builder.WriteString(theme.OptionsFgColor.Sprint(separator))
|
|
length += len(separator)
|
|
}
|
|
builder.WriteString(formatted)
|
|
length += len(plainText)
|
|
}
|
|
|
|
return builder.String()
|
|
}
|
|
|
|
func (self *OptionsMapMgr) renderOptions(options string) {
|
|
self.c.SetViewContent(self.c.Views().Options, options)
|
|
}
|
|
|
|
type bindingInfo struct {
|
|
key string
|
|
description string
|
|
style style.TextStyle
|
|
}
|