Compare commits

..

No commits in common. "6444cc7905a5459b5346d069ec2465df83b82793" and "5ae60e2e806adba1652bec64a62caa473004d7ed" have entirely different histories.

2 changed files with 9 additions and 15 deletions

View File

@ -2014,9 +2014,7 @@ func (t *Terminal) resizeWindows(forcePreview bool, redrawBorder bool) {
// Print border label // Print border label
t.printLabel(t.wborder, t.listLabel, t.listLabelOpts, t.listLabelLen, t.listBorderShape, false) t.printLabel(t.wborder, t.listLabel, t.listLabelOpts, t.listLabelLen, t.listBorderShape, false)
t.printLabel(t.border, t.borderLabel, t.borderLabelOpts, t.borderLabelLen, t.borderShape, false) t.printLabel(t.border, t.borderLabel, t.borderLabelOpts, t.borderLabelLen, t.borderShape, false)
if t.pborder != nil && t.pwindow.Height() != t.pborder.Height() { // To address --preview-border=line with different positions t.printLabel(t.pborder, t.previewLabel, t.previewLabelOpts, t.previewLabelLen, t.activePreviewOpts.border, false)
t.printLabel(t.pborder, t.previewLabel, t.previewLabelOpts, t.previewLabelLen, t.activePreviewOpts.border, false)
}
t.printLabel(t.inputBorder, t.inputLabel, t.inputLabelOpts, t.inputLabelLen, t.inputBorderShape, false) t.printLabel(t.inputBorder, t.inputLabel, t.inputLabelOpts, t.inputLabelLen, t.inputBorderShape, false)
t.printLabel(t.headerBorder, t.headerLabel, t.headerLabelOpts, t.headerLabelLen, t.headerBorderShape, false) t.printLabel(t.headerBorder, t.headerLabel, t.headerLabelOpts, t.headerLabelLen, t.headerBorderShape, false)
} }
@ -2031,7 +2029,7 @@ func (t *Terminal) printLabel(window tui.Window, render labelPrinter, opts label
} }
switch borderShape { switch borderShape {
case tui.BorderHorizontal, tui.BorderTop, tui.BorderBottom, tui.BorderRounded, tui.BorderSharp, tui.BorderBold, tui.BorderBlock, tui.BorderThinBlock, tui.BorderDouble, tui.BorderLine: case tui.BorderHorizontal, tui.BorderTop, tui.BorderBottom, tui.BorderRounded, tui.BorderSharp, tui.BorderBold, tui.BorderBlock, tui.BorderThinBlock, tui.BorderDouble:
if redrawBorder { if redrawBorder {
window.DrawHBorder() window.DrawHBorder()
} }
@ -2388,11 +2386,7 @@ func (t *Terminal) printHeaderImpl() {
} }
// Wrapping is not supported for header // Wrapping is not supported for header
wrap := t.wrap wrap := t.wrap
indentSize := t.pointerLen + t.markerLen indent := strings.Repeat(" ", t.pointerLen+t.markerLen)
if t.headerBorderShape.HasLeft() && !t.listBorderShape.HasLeft() {
indentSize = util.Max(0, indentSize-(1+t.borderWidth))
}
indent := strings.Repeat(" ", indentSize)
t.wrap = false t.wrap = false
for idx, lineStr := range append(append([]string{}, t.header0...), t.header...) { for idx, lineStr := range append(append([]string{}, t.header0...), t.header...) {
line := idx line := idx

View File

@ -3588,9 +3588,9 @@ class TestGoFZF < TestBase
11 11
> 10 > 10
3 3
2 2
1 1
header header
19/97 19/97
> 1 > 1
@ -3609,9 +3609,9 @@ class TestGoFZF < TestBase
19/97 19/97
> 1 > 1
3 3
2 2
1 1
header header