diff --git a/src/textual/widget.py b/src/textual/widget.py
index fbd80b6440..f3f8196aed 100644
--- a/src/textual/widget.py
+++ b/src/textual/widget.py
@@ -1236,9 +1236,9 @@ def _get_box_model(
content_width = Fraction(
self.get_content_width(content_container - margin.totals, viewport)
)
- if styles.overflow_x == "auto" and (
- styles.scrollbar_gutter == "stable" or self.show_vertical_scrollbar
- ):
+ if (
+ styles.overflow_x == "auto" and styles.scrollbar_gutter == "stable"
+ ) or self.show_vertical_scrollbar:
content_width += styles.scrollbar_size_vertical
if (
content_width < content_container.width
@@ -1288,9 +1288,9 @@ def _get_box_model(
content_height = Fraction(
self.get_content_height(content_container, viewport, int(content_width))
)
- if styles.overflow_y == "auto" and (
- styles.scrollbar_gutter == "stable" or self.show_horizontal_scrollbar
- ):
+ if (
+ styles.overflow_y == "auto" and styles.scrollbar_gutter == "stable"
+ ) or self.show_horizontal_scrollbar:
content_height += styles.scrollbar_size_horizontal
if (
content_height < content_container.height
diff --git a/tests/snapshot_tests/__snapshots__/test_snapshots/test_auto_table.svg b/tests/snapshot_tests/__snapshots__/test_snapshots/test_auto_table.svg
index ccfb82f1cb..3f8165023c 100644
--- a/tests/snapshot_tests/__snapshots__/test_snapshots/test_auto_table.svg
+++ b/tests/snapshot_tests/__snapshots__/test_snapshots/test_auto_table.svg
@@ -19,202 +19,202 @@
font-weight: 700;
}
- .terminal-1765028414-matrix {
+ .terminal-3267243469-matrix {
font-family: Fira Code, monospace;
font-size: 20px;
line-height: 24.4px;
font-variant-east-asian: full-width;
}
- .terminal-1765028414-title {
+ .terminal-3267243469-title {
font-size: 18px;
font-weight: bold;
font-family: arial;
}
- .terminal-1765028414-r1 { fill: #c5c8c6 }
-.terminal-1765028414-r2 { fill: #e3e3e3 }
-.terminal-1765028414-r3 { fill: #004578 }
-.terminal-1765028414-r4 { fill: #e1e1e1 }
-.terminal-1765028414-r5 { fill: #632ca6 }
-.terminal-1765028414-r6 { fill: #dde6ed;font-weight: bold }
-.terminal-1765028414-r7 { fill: #14191f }
-.terminal-1765028414-r8 { fill: #23568b }
+ .terminal-3267243469-r1 { fill: #c5c8c6 }
+.terminal-3267243469-r2 { fill: #e3e3e3 }
+.terminal-3267243469-r3 { fill: #004578 }
+.terminal-3267243469-r4 { fill: #e1e1e1 }
+.terminal-3267243469-r5 { fill: #632ca6 }
+.terminal-3267243469-r6 { fill: #dde6ed;font-weight: bold }
+.terminal-3267243469-r7 { fill: #14191f }
+.terminal-3267243469-r8 { fill: #23568b }
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- MyApp
+ MyApp
-
-
-
- ⭘MyApp
-╭──────────────────╮╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
-│ok ││test │
-│╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍││╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍│
-│││╭─ 0 ──────────────────────────────────────╮╭─ 1 ──────────────────────────────────────╮╭─ 2 ─────│
-│││││││││
-││││ Foo Bar Baz ││ Foo Bar Baz ││ Foo │
-││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH│
-││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH│
-││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH│
-││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH│
-││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH│
-││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH│
-││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH│
-││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH│
-││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH│
-││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH│
-││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH│
-││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH│
-││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH│
-││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH│
-││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH│
-││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH│
-││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH│
-││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY▁▁││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY▁▁││ ABCDEFGH│
-││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH│
-││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH│
-││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH│
-││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH│
-││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH│
-││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH│
-││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH│
-││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH│
-││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH│
-││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH│
-││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH│
-││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXY││ ABCDEFGH│
-│││╰──────────────────────────────────────────╯╰──────────────────────────────────────────╯╰─────────│
-│││▋│
-╰──────────────────╯╰──────────────────────────────────────────────────────────────────────────────────────────────────╯
+
+
+
+ ⭘MyApp
+╭──────────────────╮╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
+│ok ││test │
+│╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍││╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍│
+│││╭─ 0 ────────────────────────────────────────╮╭─ 1 ────────────────────────────────────────╮╭─ 2 ─│
+│││││││││
+││││ Foo Bar Baz ││ Foo Bar Baz ││ Foo │
+││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCD│
+││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCD│
+││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCD│
+││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCD│
+││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCD│
+││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCD│
+││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCD│
+││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCD│
+││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCD│
+││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCD│
+││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCD│
+││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCD│
+││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCD│
+││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCD│
+││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCD│
+││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCD│
+││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCD│
+││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ▁▁││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ▁▁││ ABCD│
+││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCD│
+││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCD│
+││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCD│
+││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCD│
+││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCD│
+││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCD│
+││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCD│
+││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCD│
+││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCD│
+││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCD│
+││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCD│
+││││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCDEFGH 0123456789 IJKLMNOPQRSTUVWXYZ ││ ABCD│
+│││╰────────────────────────────────────────────╯╰────────────────────────────────────────────╯╰─────│
+│││▎│
+╰──────────────────╯╰──────────────────────────────────────────────────────────────────────────────────────────────────╯