go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-15 01:34:26 +02:00
Code Issues Releases Activity

Merge pull request #2146 from Ryooooooga/fix-initial-origin-editor

Browse Source
This commit is contained in:
Jesse Duffield
2022-09-07 15:54:57 -07:00
committed by GitHub
parent 448ff80d7d eb9fbb0a33
commit 46b08e7d70
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/gui/confirmation_panel.go
View File

@ -181,6 +181,7 @@ func (gui *Gui) createPopupPanel(opts types.CreatePopupPanelOpts) error {
textArea := confirmationView.TextArea textArea := confirmationView.TextArea
textArea.Clear() textArea.Clear()
textArea.TypeString(opts.Prompt) textArea.TypeString(opts.Prompt)
gui.resizeConfirmationPanel()
confirmationView.RenderTextArea() confirmationView.RenderTextArea()
} else { } else {
if err := gui.renderString(confirmationView, style.AttrBold.Sprint(opts.Prompt)); err != nil { if err := gui.renderString(confirmationView, style.AttrBold.Sprint(opts.Prompt)); err != nil {

6
pkg/gui/view_helpers.go
View File

@ -87,7 +87,11 @@ func (gui *Gui) resizeConfirmationPanel() {
} }
panelWidth := gui.getConfirmationPanelWidth() panelWidth := gui.getConfirmationPanelWidth()
prompt := gui.Views.Confirmation.Buffer() prompt := gui.Views.Confirmation.Buffer()
wrap := !gui.Views.Confirmation.Editable wrap := true
if gui.Views.Confirmation.Editable {
prompt = gui.Views.Confirmation.TextArea.GetContent()
wrap = false
}
panelHeight := gui.getMessageHeight(wrap, prompt, panelWidth) + suggestionsViewHeight panelHeight := gui.getMessageHeight(wrap, prompt, panelWidth) + suggestionsViewHeight
x0, y0, x1, y1 := gui.getConfirmationPanelDimensionsAux(panelWidth, panelHeight) x0, y0, x1, y1 := gui.getConfirmationPanelDimensionsAux(panelWidth, panelHeight)
confirmationViewBottom := y1 - suggestionsViewHeight confirmationViewBottom := y1 - suggestionsViewHeight