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

Fix silly mistake when resolving merge conflict.

Browse Source
This commit is contained in:
Rodrigo Girão Serrão
2023-01-23 17:41:19 +00:00
parent 2deb96c3ed
commit 3305659132
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/textual/css/_style_properties.py
View File

@@ -220,9 +220,9 @@ class ScalarListProperty:
percent_unit: The dimension to which percentage scalars will be relative to. percent_unit: The dimension to which percentage scalars will be relative to.
""" """
def __init__(self, children: bool = False, percent_unit: Unit) -> None: def __init__(self, percent_unit: Unit, children: bool = False) -> None:
self.children = children
self.percent_unit = percent_unit self.percent_unit = percent_unit
self.children = children
def __set_name__(self, owner: Styles, name: str) -> None: def __set_name__(self, owner: Styles, name: str) -> None:
self.name = name self.name = name

4
src/textual/css/styles.py
View File

@@ -287,8 +287,8 @@ class StylesBase(ABC):
content_align_vertical = StringEnumProperty(VALID_ALIGN_VERTICAL, "top") content_align_vertical = StringEnumProperty(VALID_ALIGN_VERTICAL, "top")
content_align = AlignProperty() content_align = AlignProperty()
grid_rows = ScalarListProperty(children=True, percent_unit=Unit.HEIGHT) grid_rows = ScalarListProperty(percent_unit=Unit.HEIGHT, children=True)
grid_columns = ScalarListProperty(children=True, percent_unit=Unit.WIDTH) grid_columns = ScalarListProperty(percent_unit=Unit.WIDTH, children=True)
grid_size_columns = IntegerProperty(default=1, layout=True, children=True) grid_size_columns = IntegerProperty(default=1, layout=True, children=True)
grid_size_rows = IntegerProperty(default=0, layout=True, children=True) grid_size_rows = IntegerProperty(default=0, layout=True, children=True)