Skip to content

Preserve maximum sizes of zero-preferred dimensions #2136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FanWu-ai wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Preserve maximum sizes of zero-preferred dimensions #2136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/prompt_toolkit/layout/dimension.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ def max_layout_dimensions(dimensions: list[Dimension]) -> Dimension:
return Dimension.zero()

# Ignore empty dimensions. (They should not reduce the size of others.)
dimensions = [d for d in dimensions if d.preferred != 0 and d.max != 0]
dimensions = [d for d in dimensions if d.max != 0]

if dimensions:
# Take the highest minimum dimension.
Expand Down
28 changes: 28 additions & 0 deletions tests/test_layout.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from prompt_toolkit.layout import InvalidLayoutError, Layout
from prompt_toolkit.layout.containers import HSplit, VSplit, Window
from prompt_toolkit.layout.controls import BufferControl
from prompt_toolkit.layout.dimension import Dimension, max_layout_dimensions


def test_layout_class():
Expand Down Expand Up @@ -51,3 +52,30 @@ def test_layout_class():
def test_create_invalid_layout():
with pytest.raises(InvalidLayoutError):
Layout(HSplit([]))


@pytest.mark.parametrize(
"dimensions, expected",
[
([Dimension(max=10)], (0, 10, 0)),
([Dimension(max=10, preferred=0)], (0, 10, 0)),
([Dimension.zero(), Dimension(max=10)], (0, 10, 0)),
([Dimension(), Dimension(max=10)], (0, 10, 0)),
([Dimension(max=10), Dimension(max=20)], (0, 10, 0)),
([Dimension(max=10), Dimension(max=20, preferred=5)], (0, 10, 5)),
([Dimension(max=10), Dimension(max=20, preferred=12)], (0, 12, 12)),
([], (0, 0, 0)),
([Dimension.zero()], (0, 0, 0)),
([Dimension.zero(), Dimension.exact(8)], (8, 8, 8)),
],
)
def test_max_layout_dimensions_preserves_zero_preferred_max(dimensions, expected):
dimension = max_layout_dimensions(dimensions)
assert (dimension.min, dimension.max, dimension.preferred) == expected


def test_nested_split_preserves_zero_preferred_width_limit():
child = HSplit([Window(width=Dimension(max=10, preferred=0))])

assert child.preferred_width(80).max == 10
assert VSplit([child, Window()])._divide_widths(80) == [10, 0, 70]