From 3ada4dde12571d794a7415e4516e457961e01c45 Mon Sep 17 00:00:00 2001 From: Ryooooooga Date: Thu, 18 Aug 2022 23:05:30 +0900 Subject: [PATCH] fix: fix initial scroll position of edit box --- pkg/gui/confirmation_panel.go | 2 ++ pkg/gui/view_helpers.go | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/gui/confirmation_panel.go b/pkg/gui/confirmation_panel.go index 1ad724ad5..16bc551be 100644 --- a/pkg/gui/confirmation_panel.go +++ b/pkg/gui/confirmation_panel.go @@ -122,6 +122,7 @@ func (gui *Gui) prepareConfirmationPanel( gui.Views.Confirmation.Wrap = !opts.Editable gui.Views.Confirmation.FgColor = theme.GocuiDefaultTextColor gui.Views.Confirmation.Mask = runeForMask(opts.Mask) + _ = gui.Views.Confirmation.SetOrigin(0, 0) gui.findSuggestions = opts.FindSuggestionsFunc if opts.FindSuggestionsFunc != nil { @@ -133,6 +134,7 @@ func (gui *Gui) prepareConfirmationPanel( suggestionsView.Title = fmt.Sprintf(gui.c.Tr.SuggestionsTitle, gui.c.UserConfig.Keybinding.Universal.TogglePanel) } + gui.resizeConfirmationPanel() return nil } diff --git a/pkg/gui/view_helpers.go b/pkg/gui/view_helpers.go index 40bc2fa02..713639251 100644 --- a/pkg/gui/view_helpers.go +++ b/pkg/gui/view_helpers.go @@ -87,7 +87,8 @@ func (gui *Gui) resizeConfirmationPanel() { } panelWidth := gui.getConfirmationPanelWidth() prompt := gui.Views.Confirmation.Buffer() - panelHeight := gui.getMessageHeight(true, prompt, panelWidth) + suggestionsViewHeight + wrap := !gui.Views.Confirmation.Editable + panelHeight := gui.getMessageHeight(wrap, prompt, panelWidth) + suggestionsViewHeight x0, y0, x1, y1 := gui.getConfirmationPanelDimensionsAux(panelWidth, panelHeight) confirmationViewBottom := y1 - suggestionsViewHeight _, _ = gui.g.SetView(gui.Views.Confirmation.Name(), x0, y0, x1, confirmationViewBottom, 0)