From ea29604c29d7b32b724d0b4db994951f9a672c27 Mon Sep 17 00:00:00 2001
From: Will McGugan <willmcgugan@gmail.com>
Date: Wed, 29 Jun 2022 17:23:51 +0100
Subject: [PATCH] normalize border

---
 src/textual/_border.py        |  2 ++
 src/textual/_styles_render.py | 19 ++++++++++++++-----
 src/textual/css/types.py      |  1 +
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/textual/_border.py b/src/textual/_border.py
index 97a5ecd8b..576742413 100644
--- a/src/textual/_border.py
+++ b/src/textual/_border.py
@@ -26,6 +26,7 @@ BORDER_CHARS: dict[EdgeType, tuple[str, str, str]] = {
     #  - 2nd string represents (mid1, mid2, mid3)
     #  - 3rd string represents (bottom1, bottom2, bottom3)
     "": ("   ", "   ", "   "),
+    "ascii": ("+-+", "| |", "+-+"),
     "none": ("   ", "   ", "   "),
     "hidden": ("   ", "   ", "   "),
     "blank": ("   ", "   ", "   "),
@@ -48,6 +49,7 @@ BORDER_LOCATIONS: dict[
     EdgeType, tuple[tuple[int, int, int], tuple[int, int, int], tuple[int, int, int]]
 ] = {
     "": ((0, 0, 0), (0, 0, 0), (0, 0, 0)),
+    "ascii": ((0, 0, 0), (0, 0, 0), (0, 0, 0)),
     "none": ((0, 0, 0), (0, 0, 0), (0, 0, 0)),
     "hidden": ((0, 0, 0), (0, 0, 0), (0, 0, 0)),
     "blank": ((0, 0, 0), (0, 0, 0), (0, 0, 0)),
diff --git a/src/textual/_styles_render.py b/src/textual/_styles_render.py
index c311a5938..1803d419b 100644
--- a/src/textual/_styles_render.py
+++ b/src/textual/_styles_render.py
@@ -7,6 +7,7 @@ from rich.segment import Segment
 
 from ._border import get_box
 from .color import Color
+from .css.types import EdgeType
 from ._segment_tools import line_crop
 from ._types import Lines
 from .geometry import Region, Size
@@ -17,6 +18,9 @@ if TYPE_CHECKING:
     from .css.styles import RenderStyles
 
 
+NORMALIZE_BORDER: dict[EdgeType, EdgeType] = {"none": "", "hidden": ""}
+
+
 class StylesRenderer:
     def __init__(self, widget: Widget) -> None:
         self._widget = widget
@@ -89,6 +93,12 @@ class StylesRenderer:
             (border_left, border_left_color),
         ) = styles.border
 
+        normalize_border_get = NORMALIZE_BORDER.get
+        border_top = normalize_border_get(border_top, border_top)
+        border_right = normalize_border_get(border_right, border_right)
+        border_bottom = normalize_border_get(border_bottom, border_bottom)
+        border_left = normalize_border_get(border_left, border_left)
+
         from_color = Style.from_color
 
         inner_style = from_color(bgcolor=background.rich_color)
@@ -139,10 +149,9 @@ class StylesRenderer:
             return [Segment(" " * width, background_style)]
 
         # Apply background style
-        line_y = y - gutter.top
         line = list(
             Segment.apply_style(
-                self.render_content_line(line_y, content_width), inner_style
+                self.render_content_line(y - gutter.top, content_width), inner_style
             )
         )
 
@@ -197,10 +206,10 @@ if __name__ == "__main__":
     styles = Styles()
     styles.padding = 2
     styles.border = (
+        ("tall", Color.parse("red")),
+        ("none", Color.parse("white")),
         ("outer", Color.parse("red")),
-        ("", Color.parse("white")),
-        ("outer", Color.parse("red")),
-        ("", Color.parse("red")),
+        ("none", Color.parse("red")),
     )
 
     size = Size(40, 10)
diff --git a/src/textual/css/types.py b/src/textual/css/types.py
index e7fd749b2..f353d5580 100644
--- a/src/textual/css/types.py
+++ b/src/textual/css/types.py
@@ -14,6 +14,7 @@ else:
 Edge = Literal["top", "right", "bottom", "left"]
 EdgeType = Literal[
     "",
+    "ascii",
     "none",
     "hidden",
     "blank",