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

replaced _outline

Browse Source
This commit is contained in:
Will McGugan
2021-10-24 16:37:01 +01:00
parent b40c13d379
commit 4b2e44c86c
3 changed files with 23 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

144
src/textual/_outline.py
View File

@@ -1,144 +0,0 @@
from __future__ import annotations
from rich.console import Console, ConsoleOptions, RenderResult, RenderableType
from rich.measure import Measurement
from rich.segment import Segment, SegmentLines
from ._box import BOX_STYLES
from .css.types import EdgeStyle
class Outline:
def __init__(
self,
renderable: RenderableType,
edge_styles: tuple[EdgeStyle, EdgeStyle, EdgeStyle, EdgeStyle],
) -> None:
self.renderable = renderable
self.edge_styles = edge_styles
@property
def sides(self) -> tuple[str, str, str, str]:
(top, _), (right, _), (bottom, _), (left, _) = self.edge_styles
return (top or "none", right or "none", bottom or "none", left or "none")
@property
def styles(self) -> tuple[Style, Style, Style, Style]:
(_, top), (_, right), (_, left), (_, bottom) = self.edge_styles
return (top, right, left, bottom)
def __rich_console__(
self, console: "Console", options: "ConsoleOptions"
) -> "RenderResult":
width = options.max_width
lines = console.render_lines(self.renderable, options)
top, right, bottom, left = self.sides
top_style, right_style, bottom_style, left_style = self.styles
BOX = BOX_STYLES
mid_top = 0
mid_end = len(lines)
if len(lines) < 2 or width < 2:
yield SegmentLines(lines, new_lines=True)
return
if top != "none":
top_chars = BOX[top][0]
row = top_chars[1] * width
if left:
row = top_chars[0] + row[1:]
if right:
row = row[:-1] + top_chars[2]
lines[0] = [Segment(row, top_style)]
mid_top += 1
if bottom != "none":
bottom_chars = BOX[bottom][2]
row = bottom_chars[1] * width
if left:
row = bottom_chars[0] + row[1:]
if right:
row = row[:-1] + bottom_chars[2]
lines[-1] = [Segment(row, bottom_style)]
mid_end -= 1
if left != "none" and right != "none":
left_char = BOX[left][1][0]
right_char = BOX[right][1][2]
for line in lines[mid_top:mid_end]:
_, line_contents = Segment.divide(line, [1, width - 1])
line[:] = [
Segment(left_char, left_style),
*line_contents,
Segment(right_char, right_style),
]
elif left != "none":
left_char = BOX[left][1][0]
for line in lines[mid_top:mid_end]:
_, line_contents = Segment.divide(line, [1, width])
line[:] = [
Segment(left_char, left_style),
*line_contents,
]
elif right != "none":
right_char = BOX[right][1][2]
for line in lines[mid_top:mid_end]:
line_contents, _ = Segment.divide(line, [width - 1, width])
line[:] = [*line_contents, Segment(right_char, right_style)]
yield SegmentLines(lines, new_lines=True)
def __rich_measure__(
self, console: "Console", options: ConsoleOptions
) -> Measurement:
return Measurement.get(console, options, self.renderable)
if __name__ == "__main__":
from rich.console import Console
from rich.segment import SegmentLines
from rich.style import Style
from rich.text import Text
from rich.traceback import install
install(show_locals=True)
console = Console()
text = Text("Textual " * 30, style="dim")
outline = Outline(
text,
(
("", Style.parse("default")),
("outer", Style.parse("red")),
("", Style.parse("default")),
("outer", Style.parse("green")),
),
)
console.print(outline)
# outline = Outline(
# text,
# ("dashed", "dashed", "dashed", "dashed"),
# ("green", "green", "green", "green"),
# )
# console.print(Padding(outline, 1))
# lines = console.render_lines(text, console.options)
# render_outline(
# lines,
# console.width,
# (True, True, True, True),
# DrawStyle.SQUARE,
# Style(color="green"),
# )
# console.print(SegmentLines(lines, new_lines=True))

21
src/textual/css/_styles_builder.py
View File

@@ -104,23 +104,28 @@ class StylesBuilder:
def process_margin(self, name: str, tokens: list[Token]) -> None:
self._process_space(name, tokens)
def _parse_border(self, name: str, tokens: list[Token]) -> tuple[str, Color]:
color = Color.default()
def _parse_border(self, name: str, tokens: list[Token]) -> tuple[str, Style]:
style = Style()
border_type = "solid"
style_tokens: list[str] = []
append = style_tokens.append
for token in tokens:
location, token_name, value = token
if token_name == "token":
if value in ANSI_COLOR_NAMES:
color = Color.parse(value)
elif value in VALID_BORDER:
if value in VALID_BORDER:
border_type = value
else:
self.error(name, token, f"unknown token {value!r} in declaration")
append(value)
elif token_name == "color":
color = Color.parse(value)
append(value)
else:
self.error(name, token, f"unexpected token {value!r} in declaration")
return (border_type, color)
style_definition = " ".join(style_tokens)
try:
style = Style.parse(style_definition)
except Exception as error:
self.error(name, tokens[0], f"error in {name} declaration; {error}")
return (border_type, style)
def _process_border(self, edge: str, name: str, tokens: list[Token]) -> None:
border = self._parse_border("border", tokens)

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

@@ -185,34 +185,20 @@ class Styles:
and self._border_bottom == self._border_left
):
_type, style = self._border_top
append_declaration(
"border", f"{_type} {style.color.name if style.color else ''}"
)
append_declaration("border", f"{_type} {style}")
else:
if self._border_top is not None:
_type, style = self._border_top
append_declaration(
"border-top",
f"{_type} {style.color.name if style.color else ''}",
)
append_declaration("border-top", f"{_type} {style}")
if self._border_right is not None:
_type, style = self._border_right
append_declaration(
"border-right",
f"{_type} {style.color.name if style.color else ''}",
)
append_declaration("border-right", f"{_type} {style}")
if self._border_bottom is not None:
_type, style = self._border_bottom
append_declaration(
"border-bottom",
f"{_type} {style.color.name if style.color else ''}",
)
append_declaration("border-bottom", f"{_type} {style}")
if self._border_left is not None:
_type, style = self._border_left
append_declaration(
"border-left",
f"{_type} {style.color.name if style.color else ''}",
)
append_declaration("border-left", f"{_type} {style}")
if (
self._outline_top is not None
@@ -221,32 +207,20 @@ class Styles:
and self._outline_bottom == self._outline_left
):
_type, style = self._outline_top
append_declaration(
"outline", f"{_type} {style.color.name if style.color else ''}"
)
append_declaration("outline", f"{_type} {style}")
else:
if self._outline_top is not None:
_type, style = self._outline_top
append_declaration(
"outline-top", f"{_type} {style.color.name if style.color else ''}"
)
append_declaration("outline-top", f"{_type} {style}")
if self._outline_right is not None:
_type, style = self._outline_right
append_declaration(
"outline-right",
f"{_type} {style.color.name if style.color else ''}",
)
append_declaration("outline-right", f"{_type} {style}")
if self._outline_bottom is not None:
_type, style = self._outline_bottom
append_declaration(
"outline-bottom",
f"{_type} {style.color.name if style.color else ''}",
)
append_declaration("outline-bottom", f"{_type} {style}")
if self._outline_left is not None:
_type, style = self._outline_left
append_declaration(
"outline-left", f"{_type} {style.color.name if style.color else ''}"
)
append_declaration("outline-left", f"{_type} {style}")
if self.offset:
x, y = self.offset