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

rename of attributes

Browse Source
This commit is contained in:
Will McGugan
2021-08-18 20:35:56 +01:00
parent 33ba899b0f
commit d5fb5b1694
1 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/textual/widget.py
View File

@@ -76,22 +76,18 @@ class Widget(MessagePump):
layout_offset_y: Reactive[float] = Reactive(0.0, layout=True)
style: Reactive[str | None] = Reactive(None)
style_padding: Reactive[PaddingDimensions | None] = Reactive(None, layout=True)
style_margin: Reactive[PaddingDimensions | None] = Reactive(None, layout=True)
style_border: Reactive[str] = Reactive("none", layout=True)
style_border_style: Reactive[str] = Reactive("")
style_border_title: Reactive[TextType] = Reactive("")
padding: Reactive[PaddingDimensions | None] = Reactive(None, layout=True)
margin: Reactive[PaddingDimensions | None] = Reactive(None, layout=True)
border: Reactive[str] = Reactive("none", layout=True)
border_style: Reactive[str] = Reactive("")
border_title: Reactive[TextType] = Reactive("")
BOX_MAP = {"normal": box.SQUARE, "round": box.ROUNDED, "bold": box.HEAVY}
def validate_style_padding(
self, padding: PaddingDimensions
) -> tuple[int, int, int, int]:
def validate_padding(self, padding: PaddingDimensions) -> tuple[int, int, int, int]:
return Padding.unpack(padding)
def validate_style_margin(
self, padding: PaddingDimensions
) -> tuple[int, int, int, int]:
def validate_margin(self, padding: PaddingDimensions) -> tuple[int, int, int, int]:
return Padding.unpack(padding)
def validate_layout_offset_x(self, value) -> int:
@@ -121,16 +117,16 @@ class Widget(MessagePump):
RenderableType: A new renderable.
"""
renderable = self.render()
if self.style_padding is not None:
renderable = Padding(renderable, self.style_padding)
if self.style_border in self.BOX_MAP:
if self.padding is not None:
renderable = Padding(renderable, self.padding)
if self.border in self.BOX_MAP:
renderable = Panel(
renderable,
box=self.BOX_MAP.get(self.style_border) or box.SQUARE,
style=self.style_border_style,
box=self.BOX_MAP.get(self.border) or box.SQUARE,
style=self.border_style,
)
if self.style_margin is not None:
renderable = Padding(renderable, self.style_margin)
if self.margin is not None:
renderable = Padding(renderable, self.margin)
if self.style:
renderable = Styled(renderable, self.style)
return renderable