alihan/textual
1
0
Fork 0
mirror of https://github.com/Textualize/textual.git synced 2025-10-17 02:38:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

grid and snapshot

Browse Source
This commit is contained in:
Will McGugan
2024-11-20 13:26:33 +00:00
parent 9278789b6d
commit 0c1c59d6b8
2 changed files with 168 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/textual/layouts/grid.py
View File

@@ -260,8 +260,6 @@ class GridLayout(Layout):
placements: list[WidgetPlacement] = []
_WidgetPlacement = WidgetPlacement
add_placement = placements.append
widgets: list[Widget] = []
add_widget = widgets.append
max_column = len(columns) - 1
max_row = len(rows) - 1
@@ -297,18 +295,23 @@ class GridLayout(Layout):
else NULL_OFFSET
)
add_placement(
_WidgetPlacement(
region + offset,
placement_offset,
(
margin
if gutter_spacing is None
else margin.grow_maximum(gutter_spacing)
),
widget,
)
placement = _WidgetPlacement(
region + offset,
placement_offset,
(
margin
if gutter_spacing is None
else margin.grow_maximum(gutter_spacing)
),
widget,
)
add_widget(widget)
if (
styles.has_any_rules("constrain_x", "constrain_y")
or widget.absolute_offset is not None
):
placement = placement.process_offset(
viewport.region if placement.overlay else size.region
)
add_placement(placement)
return placements

151
tests/snapshot_tests/__snapshots__/test_snapshots/test_dock_offset.svg Normal file
View File

@@ -0,0 +1,151 @@
<svg class="rich-terminal" viewBox="0 0 994 635.5999999999999" xmlns="http://www.w3.org/2000/svg">
<!-- Generated with Rich https://www.textualize.io -->
<style>
@font-face {
font-family: "Fira Code";
src: local("FiraCode-Regular"),
url("https://cdnjs.cloudflare.com/ajax/libs/firacode/6.2.0/woff2/FiraCode-Regular.woff2") format("woff2"),
url("https://cdnjs.cloudflare.com/ajax/libs/firacode/6.2.0/woff/FiraCode-Regular.woff") format("woff");
font-style: normal;
font-weight: 400;
}
@font-face {
font-family: "Fira Code";
src: local("FiraCode-Bold"),
url("https://cdnjs.cloudflare.com/ajax/libs/firacode/6.2.0/woff2/FiraCode-Bold.woff2") format("woff2"),
url("https://cdnjs.cloudflare.com/ajax/libs/firacode/6.2.0/woff/FiraCode-Bold.woff") format("woff");
font-style: bold;
font-weight: 700;
}
.terminal-1168778975-matrix {
font-family: Fira Code, monospace;
font-size: 20px;
line-height: 24.4px;
font-variant-east-asian: full-width;
}
.terminal-1168778975-title {
font-size: 18px;
font-weight: bold;
font-family: arial;
}
.terminal-1168778975-r1 { fill: #8ad4a1 }
.terminal-1168778975-r2 { fill: #e0e0e0 }
.terminal-1168778975-r3 { fill: #c5c8c6 }
</style>
<defs>
<clipPath id="terminal-1168778975-clip-terminal">
<rect x="0" y="0" width="975.0" height="584.5999999999999" />
</clipPath>
<clipPath id="terminal-1168778975-line-0">
<rect x="0" y="1.5" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1168778975-line-1">
<rect x="0" y="25.9" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1168778975-line-2">
<rect x="0" y="50.3" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1168778975-line-3">
<rect x="0" y="74.7" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1168778975-line-4">
<rect x="0" y="99.1" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1168778975-line-5">
<rect x="0" y="123.5" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1168778975-line-6">
<rect x="0" y="147.9" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1168778975-line-7">
<rect x="0" y="172.3" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1168778975-line-8">
<rect x="0" y="196.7" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1168778975-line-9">
<rect x="0" y="221.1" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1168778975-line-10">
<rect x="0" y="245.5" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1168778975-line-11">
<rect x="0" y="269.9" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1168778975-line-12">
<rect x="0" y="294.3" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1168778975-line-13">
<rect x="0" y="318.7" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1168778975-line-14">
<rect x="0" y="343.1" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1168778975-line-15">
<rect x="0" y="367.5" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1168778975-line-16">
<rect x="0" y="391.9" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1168778975-line-17">
<rect x="0" y="416.3" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1168778975-line-18">
<rect x="0" y="440.7" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1168778975-line-19">
<rect x="0" y="465.1" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1168778975-line-20">
<rect x="0" y="489.5" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1168778975-line-21">
<rect x="0" y="513.9" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1168778975-line-22">
<rect x="0" y="538.3" width="976" height="24.65"/>
</clipPath>
</defs>
<rect fill="#292929" stroke="rgba(255,255,255,0.35)" stroke-width="1" x="1" y="1" width="992" height="633.6" rx="8"/><text class="terminal-1168778975-title" fill="#c5c8c6" text-anchor="middle" x="496" y="27">OffsetBugApp</text>
<g transform="translate(26,22)">
<circle cx="0" cy="0" r="7" fill="#ff5f57"/>
<circle cx="22" cy="0" r="7" fill="#febc2e"/>
<circle cx="44" cy="0" r="7" fill="#28c840"/>
</g>
<g transform="translate(9, 41)" clip-path="url(#terminal-1168778975-clip-terminal)">
<rect fill="#24452e" x="0" y="1.5" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#121212" x="12.2" y="1.5" width="963.8" height="24.65" shape-rendering="crispEdges"/><rect fill="#121212" x="0" y="25.9" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#24452e" x="12.2" y="25.9" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#121212" x="24.4" y="25.9" width="951.6" height="24.65" shape-rendering="crispEdges"/><rect fill="#121212" x="0" y="50.3" width="24.4" height="24.65" shape-rendering="crispEdges"/><rect fill="#24452e" x="24.4" y="50.3" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#121212" x="36.6" y="50.3" width="939.4" height="24.65" shape-rendering="crispEdges"/><rect fill="#121212" x="0" y="74.7" width="36.6" height="24.65" shape-rendering="crispEdges"/><rect fill="#24452e" x="36.6" y="74.7" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#121212" x="48.8" y="74.7" width="927.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#121212" x="0" y="99.1" width="48.8" height="24.65" shape-rendering="crispEdges"/><rect fill="#24452e" x="48.8" y="99.1" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#121212" x="61" y="99.1" width="915" height="24.65" shape-rendering="crispEdges"/><rect fill="#121212" x="0" y="123.5" width="61" height="24.65" shape-rendering="crispEdges"/><rect fill="#24452e" x="61" y="123.5" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#121212" x="73.2" y="123.5" width="902.8" height="24.65" shape-rendering="crispEdges"/><rect fill="#121212" x="0" y="147.9" width="73.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#24452e" x="73.2" y="147.9" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#121212" x="85.4" y="147.9" width="890.6" height="24.65" shape-rendering="crispEdges"/><rect fill="#121212" x="0" y="172.3" width="85.4" height="24.65" shape-rendering="crispEdges"/><rect fill="#24452e" x="85.4" y="172.3" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#121212" x="97.6" y="172.3" width="878.4" height="24.65" shape-rendering="crispEdges"/><rect fill="#121212" x="0" y="196.7" width="97.6" height="24.65" shape-rendering="crispEdges"/><rect fill="#24452e" x="97.6" y="196.7" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#121212" x="109.8" y="196.7" width="866.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#121212" x="0" y="221.1" width="109.8" height="24.65" shape-rendering="crispEdges"/><rect fill="#24452e" x="109.8" y="221.1" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#121212" x="122" y="221.1" width="854" height="24.65" shape-rendering="crispEdges"/><rect fill="#121212" x="0" y="245.5" width="976" height="24.65" shape-rendering="crispEdges"/><rect fill="#121212" x="0" y="269.9" width="976" height="24.65" shape-rendering="crispEdges"/><rect fill="#121212" x="0" y="294.3" width="976" height="24.65" shape-rendering="crispEdges"/><rect fill="#121212" x="0" y="318.7" width="976" height="24.65" shape-rendering="crispEdges"/><rect fill="#121212" x="0" y="343.1" width="976" height="24.65" shape-rendering="crispEdges"/><rect fill="#121212" x="0" y="367.5" width="976" height="24.65" shape-rendering="crispEdges"/><rect fill="#121212" x="0" y="391.9" width="976" height="24.65" shape-rendering="crispEdges"/><rect fill="#121212" x="0" y="416.3" width="976" height="24.65" shape-rendering="crispEdges"/><rect fill="#121212" x="0" y="440.7" width="976" height="24.65" shape-rendering="crispEdges"/><rect fill="#121212" x="0" y="465.1" width="976" height="24.65" shape-rendering="crispEdges"/><rect fill="#121212" x="0" y="489.5" width="976" height="24.65" shape-rendering="crispEdges"/><rect fill="#121212" x="0" y="513.9" width="976" height="24.65" shape-rendering="crispEdges"/><rect fill="#121212" x="0" y="538.3" width="976" height="24.65" shape-rendering="crispEdges"/><rect fill="#121212" x="0" y="562.7" width="976" height="24.65" shape-rendering="crispEdges"/>
<g class="terminal-1168778975-matrix">
<text class="terminal-1168778975-r1" x="0" y="20" textLength="12.2" clip-path="url(#terminal-1168778975-line-0)">0</text><text class="terminal-1168778975-r3" x="976" y="20" textLength="12.2" clip-path="url(#terminal-1168778975-line-0)">
</text><text class="terminal-1168778975-r1" x="12.2" y="44.4" textLength="12.2" clip-path="url(#terminal-1168778975-line-1)">1</text><text class="terminal-1168778975-r3" x="976" y="44.4" textLength="12.2" clip-path="url(#terminal-1168778975-line-1)">
</text><text class="terminal-1168778975-r1" x="24.4" y="68.8" textLength="12.2" clip-path="url(#terminal-1168778975-line-2)">2</text><text class="terminal-1168778975-r3" x="976" y="68.8" textLength="12.2" clip-path="url(#terminal-1168778975-line-2)">
</text><text class="terminal-1168778975-r1" x="36.6" y="93.2" textLength="12.2" clip-path="url(#terminal-1168778975-line-3)">3</text><text class="terminal-1168778975-r3" x="976" y="93.2" textLength="12.2" clip-path="url(#terminal-1168778975-line-3)">
</text><text class="terminal-1168778975-r1" x="48.8" y="117.6" textLength="12.2" clip-path="url(#terminal-1168778975-line-4)">4</text><text class="terminal-1168778975-r3" x="976" y="117.6" textLength="12.2" clip-path="url(#terminal-1168778975-line-4)">
</text><text class="terminal-1168778975-r1" x="61" y="142" textLength="12.2" clip-path="url(#terminal-1168778975-line-5)">5</text><text class="terminal-1168778975-r3" x="976" y="142" textLength="12.2" clip-path="url(#terminal-1168778975-line-5)">
</text><text class="terminal-1168778975-r1" x="73.2" y="166.4" textLength="12.2" clip-path="url(#terminal-1168778975-line-6)">6</text><text class="terminal-1168778975-r3" x="976" y="166.4" textLength="12.2" clip-path="url(#terminal-1168778975-line-6)">
</text><text class="terminal-1168778975-r1" x="85.4" y="190.8" textLength="12.2" clip-path="url(#terminal-1168778975-line-7)">7</text><text class="terminal-1168778975-r3" x="976" y="190.8" textLength="12.2" clip-path="url(#terminal-1168778975-line-7)">
</text><text class="terminal-1168778975-r1" x="97.6" y="215.2" textLength="12.2" clip-path="url(#terminal-1168778975-line-8)">8</text><text class="terminal-1168778975-r3" x="976" y="215.2" textLength="12.2" clip-path="url(#terminal-1168778975-line-8)">
</text><text class="terminal-1168778975-r1" x="109.8" y="239.6" textLength="12.2" clip-path="url(#terminal-1168778975-line-9)">9</text><text class="terminal-1168778975-r3" x="976" y="239.6" textLength="12.2" clip-path="url(#terminal-1168778975-line-9)">
</text><text class="terminal-1168778975-r3" x="976" y="264" textLength="12.2" clip-path="url(#terminal-1168778975-line-10)">
</text><text class="terminal-1168778975-r3" x="976" y="288.4" textLength="12.2" clip-path="url(#terminal-1168778975-line-11)">
</text><text class="terminal-1168778975-r3" x="976" y="312.8" textLength="12.2" clip-path="url(#terminal-1168778975-line-12)">
</text><text class="terminal-1168778975-r3" x="976" y="337.2" textLength="12.2" clip-path="url(#terminal-1168778975-line-13)">
</text><text class="terminal-1168778975-r3" x="976" y="361.6" textLength="12.2" clip-path="url(#terminal-1168778975-line-14)">
</text><text class="terminal-1168778975-r3" x="976" y="386" textLength="12.2" clip-path="url(#terminal-1168778975-line-15)">
</text><text class="terminal-1168778975-r3" x="976" y="410.4" textLength="12.2" clip-path="url(#terminal-1168778975-line-16)">
</text><text class="terminal-1168778975-r3" x="976" y="434.8" textLength="12.2" clip-path="url(#terminal-1168778975-line-17)">
</text><text class="terminal-1168778975-r3" x="976" y="459.2" textLength="12.2" clip-path="url(#terminal-1168778975-line-18)">
</text><text class="terminal-1168778975-r3" x="976" y="483.6" textLength="12.2" clip-path="url(#terminal-1168778975-line-19)">
</text><text class="terminal-1168778975-r3" x="976" y="508" textLength="12.2" clip-path="url(#terminal-1168778975-line-20)">
</text><text class="terminal-1168778975-r3" x="976" y="532.4" textLength="12.2" clip-path="url(#terminal-1168778975-line-21)">
</text><text class="terminal-1168778975-r3" x="976" y="556.8" textLength="12.2" clip-path="url(#terminal-1168778975-line-22)">
</text>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB