wip-forward-control

src/musicplayer/control.gleam

@@ -1,18 +1,19 @@
-import gleam/string
-import musicplayer/ui/layout
-
 import musicplayer/input/key.{type Key}
 
 pub type Mode {
   Idle
-  Searching(input: String)
+  Searching
 }
 
 pub type Control {
-  TogglePlayPause
-  Search(input: String, capturing: Bool)
+  InputKey(Key)
 
-  SetView(view_idx: layout.ViewIdx)
+  TogglePlayPause
+  Search
+
+  Raw(String)
+  Return
+  Backspace
 
   Exit
 }
@@ -20,39 +21,24 @@ pub type Control {
 pub fn from_key(key: Key, mode: Mode) -> Result(Control, Nil) {
   case mode {
     Idle -> idle_from_key(key)
-    Searching(input) -> searching_from_key(key, input)
+    Searching -> todo
   }
 }
 
 pub fn idle_from_key(key: Key) -> Result(Control, Nil) {
   case key {
-    key.Char(char) -> {
-      case char {
-        // Views are zero indexed
-        "1" -> Ok(SetView(0))
-        "2" -> Ok(SetView(1))
-
-        " " -> Ok(TogglePlayPause)
-        "/" -> Ok(Search(input: "", capturing: True))
-        "q" -> Ok(Exit)
-
-        // NOOP
-        _ -> Error(Nil)
-      }
-    }
-
-    // NOOP
+    key.Return -> Ok(Return)
+    key.Backspace -> Ok(Backspace)
+    key.Char(char) -> Ok(idle_char_control(char))
     _ -> Error(Nil)
   }
 }
 
-pub fn searching_from_key(key: Key, input: String) -> Result(Control, Nil) {
-  case key {
-    key.Char(char) -> Ok(Search(input <> char, True))
-    key.Backspace -> Ok(Search(string.drop_end(input, 1), True))
-    key.Return -> Ok(Search(input, False))
-
-    // NOOP
-    _ -> Error(Nil)
+fn idle_char_control(char: String) -> Control {
+  case char {
+    " " -> TogglePlayPause
+    "/" -> Search
+    "q" -> Exit
+    _ -> Raw(char)
   }
 }

src/musicplayer/musicplayer.gleam

@@ -2,7 +2,7 @@ import gleam/erlang/process.{type Name, type Pid, type Subject}
 import gleam/otp/actor
 import gleam/string
 
-import musicplayer/control.{type Mode}
+import musicplayer/control.{type Control, type Mode}
 import musicplayer/input/key.{type Key}
 import musicplayer/logging/logging
 import musicplayer/mpv/control as mpv_control
@@ -10,9 +10,14 @@ import musicplayer/time/time
 import musicplayer/ui/control as ui_control
 import musicplayer/ui/layout
 
+type Input {
+  Input(capturing: Bool, content: String)
+}
+
 type State {
   State(
     mode: Mode,
+    input: Input,
     ui: Subject(ui_control.Control),
     mpv: Subject(mpv_control.Control),
   )
@@ -25,8 +30,10 @@ pub fn new(
 ) -> Result(Pid, String) {
   let input_keys = process.named_subject(input_keys_name)
 
+  let input = Input(False, "")
+
   case
-    actor.new(State(control.Idle, ui, mpv))
+    actor.new(State(control.Idle, input, ui, mpv))
     |> actor.on_message(handle_message)
     |> actor.start
   {
@@ -36,7 +43,7 @@ pub fn new(
       logging.log("musicplayer - started")
       process.spawn(fn() {
         let assert Ok(_) = process.register(process.self(), input_keys_name)
-        forward_key(musicplayer, input_keys)
+        handle_key(musicplayer, input_keys)
       })
 
       process.spawn(fn() { update_playback_time_loop(mpv, ui, 250) })
@@ -46,67 +53,104 @@ pub fn new(
   }
 }
 
-fn handle_message(state: State, key: Key) -> actor.Next(State, Key) {
-  case control.from_key(key, state.mode) {
-    Error(_) -> actor.continue(state)
-    Ok(c) ->
-      case c {
-        control.SetView(view_idx) -> {
-          logging.log(
-            "musicplayer - setting current view to: "
-            <> string.inspect(view_idx),
-          )
+fn handle_message(state: State, control: Control) -> actor.Next(State, Control) {
+  case control {
+    control.InputKey(key) -> {
+      let _ = control.from_key(key, state.mode)
+      // TODO get control and send it back to self
+      actor.continue(state)
+    }
 
-          update_current_view(state.ui, view_idx)
-          actor.continue(state)
-        }
-        control.Search(input, capturing) -> {
-          case capturing {
-            True -> {
-              logging.log("musicplayer - searching: " <> input)
+    control.Search -> {
+      logging.log("musicplayer - initiating search")
 
-              update_search(state.ui, "searching: " <> input)
+      update_search(state.ui, "searching: ")
 
-              actor.continue(State(..state, mode: control.Searching(input)))
-            }
-            False -> {
-              logging.log(
-                "musicplayer - recieved return. `input`: "
-                <> "'"
-                <> input
-                <> "'",
-              )
+      actor.continue(
+        State(
+          ..state,
+          mode: control.Searching,
+          input: Input(..state.input, capturing: True),
+        ),
+      )
+    }
 
-              update_search(state.ui, "")
+    control.Raw(content) -> {
+      logging.log("musicplayer - recieved raw input: " <> content)
 
-              actor.continue(State(..state, mode: control.Idle))
-            }
+      let content = case state.mode {
+        control.Idle ->
+          case content {
+            "1" -> state.input.content
+            _ -> state.input.content
           }
-        }
-        control.TogglePlayPause -> {
-          logging.log("musicplayer - toggling play/pause")
-
-          process.send(state.mpv, mpv_control.TogglePlayPause)
-          update_playback_time(state.mpv, state.ui)
-          actor.continue(state)
-        }
-        control.Exit -> {
-          logging.log("musicplayer - initiating musicplayer shutdown")
-          // Close `mpv` socket
-          process.call(state.mpv, 1000, fn(reply_to) {
-            mpv_control.Exit(reply_to)
-          })
-
-          // Reset terminal state (show cursor etc.)
-          process.call(state.ui, 1000, fn(reply_to) {
-            ui_control.Exit(reply_to)
-          })
-
-          logging.log("musicplayer - stopped")
-
-          actor.stop()
+        control.Searching -> {
+          let updated = state.input.content <> content
+          update_search(state.ui, "searching: " <> updated)
+          updated
         }
       }
+
+      actor.continue(State(..state, input: Input(..state.input, content:)))
+    }
+    control.Backspace -> {
+      logging.log(
+        "musicplayer - recieved backspace. mode:" <> string.inspect(state.mode),
+      )
+
+      let content = case state.mode {
+        control.Idle -> state.input.content
+        control.Searching -> {
+          let updated = string.drop_end(state.input.content, 1)
+          update_search(state.ui, "searching: " <> updated)
+          updated
+        }
+      }
+      actor.continue(State(..state, input: Input(..state.input, content:)))
+    }
+    control.Return -> {
+      logging.log(
+        "musicplayer - recieved return. `input.capture`: "
+        <> "'"
+        <> state.input.content
+        <> "'",
+      )
+
+      // Note: state.input.content is now the final input, use it
+      // before it is reset
+      case state.mode {
+        control.Idle -> Nil
+        control.Searching -> update_search(state.ui, "")
+      }
+
+      actor.continue(
+        State(
+          ..state,
+          mode: control.Idle,
+          input: Input(capturing: False, content: ""),
+        ),
+      )
+    }
+
+    control.TogglePlayPause -> {
+      logging.log("musicplayer - toggling play/pause")
+
+      process.send(state.mpv, mpv_control.TogglePlayPause)
+      update_playback_time(state.mpv, state.ui)
+      actor.continue(state)
+    }
+    control.Exit -> {
+      logging.log("musicplayer - initiating musicplayer shutdown")
+      // Close `mpv` socket
+      process.call(state.mpv, 1000, fn(reply_to) { mpv_control.Exit(reply_to) })
+
+      // Reset terminal state (show cursor etc.)
+      process.call(state.ui, 1000, fn(reply_to) { ui_control.Exit(reply_to) })
+
+      logging.log("musicplayer - stopped")
+
+      actor.stop()
+    }
   }
 }
 
@@ -134,7 +178,7 @@ fn update_playback_time(
     Error(err) ->
       process.send(
         ui,
-        ui_control.UpdateHeading(
+        ui_control.UpdateState(
           layout.PlaybackTime,
           "playback time: N/A (err: " <> err.details <> ")",
         ),
@@ -143,7 +187,7 @@ fn update_playback_time(
     Ok(mpv_control.PlaybackTime(data: playback_time)) ->
       process.send(
         ui,
-        ui_control.UpdateHeading(
+        ui_control.UpdateState(
           layout.PlaybackTime,
           "playback time: " <> time.to_duration_string(playback_time),
         ),
@@ -152,24 +196,17 @@ fn update_playback_time(
 }
 
 fn update_search(ui: Subject(ui_control.Control), content: String) -> Nil {
-  process.send(ui, ui_control.UpdateHeading(layout.Search, content))
+  process.send(ui, ui_control.UpdateState(layout.Search, content))
 }
 
-fn update_current_view(
-  ui: Subject(ui_control.Control),
-  view_idx: layout.ViewIdx,
-) {
-  process.send(ui, ui_control.SetView(view_idx))
-}
-
-/// `forward_key` listens to a subject onto which `input` will send messages with `Key`s
-/// that is then forwarded to the `musicplayer` agent to handle
-fn forward_key(musicplayer: Subject(Key), input_keys: Subject(Key)) -> Nil {
+/// `handle_key` listens to a subject onto which `input` will send messages with `Key`s
+fn handle_key(musicplayer: Subject(Control), input_keys: Subject(Key)) -> Nil {
   let _ =
     process.new_selector()
     |> process.select(input_keys)
     |> process.selector_receive_forever
+    |> fn(key) { control.InputKey(key) }
     |> process.send(musicplayer, _)
 
-  forward_key(musicplayer, input_keys)
+  handle_key(musicplayer, input_keys)
 }

src/musicplayer/ui/control.gleam

@@ -1,11 +1,12 @@
 import gleam/erlang/process.{type Subject}
 
-import musicplayer/ui/layout.{type Section, type ViewIdx}
+import musicplayer/ui/layout.{type Section}
 
 pub type Control {
   UpdateDimensions(columns: Int, rows: Int)
-  UpdateHeading(section: Section, heading: String)
-  SetView(view_idx: ViewIdx)
+  UpdateState(section: Section, content: String)
+  SetView(view_idx: layout.ViewIdx)
 
+  // NodeEvent
   Exit(reply_to: Subject(Nil))
 }

src/musicplayer/ui/layout.gleam

@@ -1,14 +1,13 @@
 import gleam/dict
 import gleam/int
 import gleam/list
-import gleam/option.{type Option, None, Some}
 import gleam/pair
 import gleam/set
 import gleam/string
 
+import musicplayer/logging/logging
 import musicplayer/ui/internal
 import musicplayer/ui/plot.{type Buffer}
-import musicplayer/ui/style.{type Style, Percent, Style}
 
 pub const root_section = "reserved_root_section"
 
@@ -20,9 +19,18 @@ pub type Section {
   PlaybackTime
 }
 
+pub type Dimension {
+  Percent(width: Int, height: Int)
+  // TODO add Flex that flows
+}
+
+pub type Style {
+  Style(dimensions: Dimension)
+}
+
 pub type Node {
-  Row(heading: Option(String), style: Style, children: List(Section))
-  Cell(heading: Option(String), style: Style)
+  Row(content: String, style: Style, children: List(Section))
+  Cell(content: String, style: Style)
 }
 
 pub type ViewIdx =
@@ -77,24 +85,19 @@ fn view_loop(i: ViewIdx, view_nodes: List(#(Section, Node))) -> View {
 
   dict.from_list(view_nodes)
   |> dict.insert(
-    view_index_section(i),
+    Section(string.append("view_", string.inspect(i))),
     Row(
-      heading: None,
-      style: Style(dimensions: Percent(width: 100, height: 100), border: None),
+      content: "",
+      style: Style(dimensions: Percent(width: 100, height: 100)),
       children: orphans,
     ),
   )
 }
 
-/// Takes a ViewIndex and create a Section key from it
-fn view_index_section(view_idx: ViewIdx) -> Section {
-  Section(string.append("view_", int.to_string(view_idx)))
-}
-
-pub fn update_section_heading(
+pub fn update_section(
   layout: Layout,
   section: Section,
-  heading: String,
+  content: String,
 ) -> Layout {
   case dict.get(layout.views, layout.current_view) {
     Error(_) -> layout
@@ -103,8 +106,8 @@ pub fn update_section_heading(
         Error(_) -> layout
         Ok(node) -> {
           let updated_node = case node {
-            Cell(..) -> Cell(..node, heading: Some(heading))
-            Row(..) -> Row(..node, heading: Some(heading))
+            Cell(..) -> Cell(..node, content: content)
+            Row(..) -> Row(..node, content: content)
           }
 
           let updated_view = dict.insert(view, section, updated_node)
@@ -122,7 +125,7 @@ pub fn update_dimensions(layout: Layout, columns: Int, rows: Int) -> Layout {
   Layout(..layout, columns:, rows:)
 }
 
-pub fn update_current_view(layout: Layout, view_idx: ViewIdx) -> Layout {
+pub fn set_view(layout: Layout, view_idx: ViewIdx) -> Layout {
   Layout(..layout, current_view: view_idx)
 }
 
@@ -144,7 +147,8 @@ pub fn render(layout: Layout) -> Nil {
       render_loop(
         view,
         context,
-        view_index_section(layout.current_view),
+        // TODO extract to function `view_index`
+        Section(string.append("view_", string.inspect(layout.current_view))),
         buffer,
       )
       |> plot.flush_buffer(layout.columns, layout.rows)
@@ -196,25 +200,15 @@ pub fn render_loop(
         )
       }
 
-      let parent = case node.heading {
-        None ->
-          plot.box(
-            buffer,
-            node_top_left_x,
-            node_top_left_y,
-            node_width,
-            node_height,
-          )
-        option.Some(heading) ->
-          plot.box_with_heading(
-            buffer,
-            node_top_left_x,
-            node_top_left_y,
-            node_width,
-            node_height,
-            heading,
-          )
-      }
+      let parent =
+        plot.box(
+          buffer,
+          node_top_left_x,
+          node_top_left_y,
+          node_width,
+          node_height,
+        )
+        |> plot.text(node.content, node_top_left_x, node_top_left_y)
 
       case node {
         Cell(..) -> parent

src/musicplayer/ui/layout_examples/layout_examples.gleam

@@ -1,9 +1,6 @@
-import gleam/option.{Some}
-
 import musicplayer/ui/internal
-import musicplayer/ui/layout.{Section}
+import musicplayer/ui/layout.{Percent, Section, Style}
 import musicplayer/ui/layout_examples/wait_for_input.{wait_for_input}
-import musicplayer/ui/style.{Percent, Style}
 
 pub fn main() {
   let assert Ok(columns) = internal.io_get_columns()
@@ -24,11 +21,8 @@ fn two_rows_with_cells(columns: Int, rows: Int) -> layout.Layout {
       #(
         Section("Row1"),
         layout.Row(
-          heading: Some("row 1"),
-          style: Style(
-            dimensions: Percent(width: 100, height: 50),
-            border: Some(style.BorderSingle),
-          ),
+          content: "row 1",
+          style: Style(dimensions: Percent(width: 100, height: 50)),
           children: [
             Section("A"),
             Section("B"),
@@ -38,31 +32,22 @@ fn two_rows_with_cells(columns: Int, rows: Int) -> layout.Layout {
       #(
         Section("A"),
         layout.Cell(
-          heading: Some("cell 1"),
-          style: Style(
-            dimensions: Percent(width: 50, height: 50),
-            border: Some(style.BorderSingle),
-          ),
+          content: "cell 1",
+          style: Style(dimensions: Percent(width: 50, height: 50)),
         ),
       ),
       #(
         Section("B"),
         layout.Cell(
-          heading: Some("cell 2"),
-          style: Style(
-            dimensions: Percent(width: 50, height: 50),
-            border: Some(style.BorderSingle),
-          ),
+          content: "cell 2",
+          style: Style(dimensions: Percent(width: 50, height: 50)),
         ),
       ),
       #(
         Section("Row2"),
         layout.Row(
-          heading: Some("row 2"),
-          style: Style(
-            dimensions: Percent(width: 50, height: 50),
-            border: Some(style.BorderSingle),
-          ),
+          content: "row 2",
+          style: Style(dimensions: Percent(width: 50, height: 50)),
           children: [],
         ),
       ),

src/musicplayer/ui/plot.gleam

@@ -49,19 +49,6 @@ pub fn box(buffer: Buffer, x: Int, y: Int, width: Int, height: Int) -> Buffer {
   }
 }
 
-pub fn box_with_heading(
-  buffer: Buffer,
-  x: Int,
-  y: Int,
-  width: Int,
-  height: Int,
-  heading: String,
-) -> Buffer {
-  let heading_margin = 1
-  box(buffer, x, y, width, height)
-  |> text(heading, x + heading_margin, y)
-}
-
 fn horizontal_line(
   buffer: Buffer,
   x: Int,

src/musicplayer/ui/style.gleam

@@ -1,34 +0,0 @@
-import gleam/option.{type Option}
-
-pub type Dimension {
-  Percent(width: Int, height: Int)
-  // TODO add Flex that flows
-}
-
-pub type Border {
-  BorderNone
-  BorderSingle
-}
-
-pub type Style {
-  Style(dimensions: Dimension, border: Option(Border))
-}
-
-pub type BorderChars {
-  BorderChars(
-    top_left: String,
-    top_right: String,
-    bottom_left: String,
-    bottom_right: String,
-    horisontal: String,
-    vertical: String,
-  )
-}
-
-// https://en.wikipedia.org/wiki/Box-drawing_characters
-pub fn border_chars(border: Border) -> BorderChars {
-  case border {
-    BorderNone -> BorderChars("", "", "", "", "", "")
-    BorderSingle -> BorderChars("┌", "┐", "└", "┘", "─", "│")
-  }
-}

src/musicplayer/ui/ui.gleam

@@ -1,7 +1,6 @@
 import gleam/erlang/process.{type Subject}
 import gleam/int
 import gleam/list
-import gleam/option.{None, Some}
 import gleam/otp/actor
 import gleam/string
 
@@ -9,7 +8,6 @@ import musicplayer/logging/logging
 import musicplayer/ui/control.{type Control}
 import musicplayer/ui/internal
 import musicplayer/ui/layout.{type Layout}
-import musicplayer/ui/style
 
 pub type State(redraw, content) {
   State(redraw: Subject(Layout), layout: Layout)
@@ -25,57 +23,33 @@ pub fn new() -> Result(Subject(Control), String) {
         #(
           layout.Header,
           layout.Row(
-            heading: Some("Foo <1> | Bar (2)"),
-            style: style.Style(
-              dimensions: style.Percent(width: 100, height: 50),
-              border: Some(style.BorderSingle),
-            ),
-            children: [],
-          ),
-        ),
-        #(
-          layout.PlaybackTime,
-          layout.Row(
-            heading: None,
-            style: style.Style(
-              dimensions: style.Percent(width: 100, height: 50),
-              border: Some(style.BorderSingle),
-            ),
-            children: [],
-          ),
-        ),
-      ],
-      [
-        #(
-          layout.Header,
-          layout.Row(
-            heading: Some("Foo (1) | Bar <2>"),
-            style: style.Style(
-              dimensions: style.Percent(width: 100, height: 33),
-              border: Some(style.BorderSingle),
-            ),
+            content: "Foo (1) | Bar (2) | Baz (3)",
+            style: layout.Style(dimensions: layout.Percent(
+              width: 100,
+              height: 33,
+            )),
             children: [],
           ),
         ),
         #(
           layout.Search,
           layout.Row(
-            heading: None,
-            style: style.Style(
-              dimensions: style.Percent(width: 100, height: 33),
-              border: Some(style.BorderSingle),
-            ),
+            content: "",
+            style: layout.Style(dimensions: layout.Percent(
+              width: 100,
+              height: 33,
+            )),
             children: [],
           ),
         ),
         #(
           layout.PlaybackTime,
           layout.Row(
-            heading: None,
-            style: style.Style(
-              dimensions: style.Percent(width: 100, height: 33),
-              border: Some(style.BorderSingle),
-            ),
+            content: "00:00",
+            style: layout.Style(dimensions: layout.Percent(
+              width: 100,
+              height: 33,
+            )),
             children: [],
           ),
         ),
@@ -134,8 +108,8 @@ fn handle_message(
         }
       }
     }
-    control.UpdateHeading(section, heading) -> {
-      let layout = layout.update_section_heading(state.layout, section, heading)
+    control.UpdateState(section, content) -> {
+      let layout = layout.update_section(state.layout, section, content)
 
       actor.send(state.redraw, layout)
       actor.continue(State(..state, layout:))
@@ -147,7 +121,7 @@ fn handle_message(
       actor.stop()
     }
     control.SetView(view_idx) -> {
-      let layout = layout.update_current_view(state.layout, view_idx)
+      let layout = layout.set_view(state.layout, view_idx)
 
       actor.send(state.redraw, layout)
       actor.continue(State(..state, layout:))

test/musicplayer/control_test.gleam

@@ -1,7 +1,7 @@
 import gleam/list
 import gleeunit
 
-import musicplayer/control.{type Control, type Mode}
+import musicplayer/control.{type Control}
 import musicplayer/input/key.{type Key, Char}
 
 pub fn main() -> Nil {
@@ -9,24 +9,16 @@ pub fn main() -> Nil {
 }
 
 type TestCase {
-  TestCase(key: Key, mode: Mode, expected: Result(Control, Nil))
+  TestCase(key: Key, expected: Result(Control, Nil))
 }
 
 pub fn control_from_key_test() {
-  let idle_tests = [
-    TestCase(Char(" "), control.Idle, Ok(control.TogglePlayPause)),
-    TestCase(Char("/"), control.Idle, Ok(control.Search("", True))),
-    TestCase(Char("q"), control.Idle, Ok(control.Exit)),
+  let test_cases = [
+    TestCase(Char(" "), Ok(control.TogglePlayPause)),
+    TestCase(Char("q"), Ok(control.Exit)),
   ]
 
-  let search_tests = [
-    TestCase(Char("a"), control.Searching(""), Ok(control.Search("a", True))),
-    TestCase(Char("b"), control.Searching("a"), Ok(control.Search("ab", True))),
-  ]
-
-  let test_cases = [idle_tests, search_tests]
-
-  list.each(list.flatten(test_cases), fn(tc) {
-    assert tc.expected == control.from_key(tc.key, tc.mode)
+  list.each(test_cases, fn(tc) {
+    assert tc.expected == control.from_key(tc.key)
   })
 }

test/musicplayer/ui/layout_test.gleam

@@ -1,13 +1,11 @@
 import gleam/dict
 import gleam/io
-import gleam/option.{Some}
 import gleam/string
 import gleeunit
 import gleeunit/should
 
-import musicplayer/ui/layout.{RenderContext, Section}
+import musicplayer/ui/layout.{Percent, RenderContext, Section, Style}
 import musicplayer/ui/plot
-import musicplayer/ui/style.{Percent, Style}
 
 pub fn main() -> Nil {
   gleeunit.main()
@@ -19,11 +17,8 @@ pub fn percent_layout_test() {
       #(
         Section("Row1"),
         layout.Row(
-          heading: Some("row 1"),
-          style: Style(
-            dimensions: Percent(width: 100, height: 50),
-            border: Some(style.BorderSingle),
-          ),
+          content: "row 1",
+          style: Style(dimensions: Percent(width: 100, height: 50)),
           children: [
             Section("A"),
             Section("B"),
@@ -33,31 +28,22 @@ pub fn percent_layout_test() {
       #(
         Section("A"),
         layout.Cell(
-          heading: Some("cell 1"),
-          style: Style(
-            dimensions: Percent(width: 50, height: 100),
-            border: Some(style.BorderSingle),
-          ),
+          content: "cell 1",
+          style: Style(dimensions: Percent(width: 50, height: 100)),
         ),
       ),
       #(
         Section("B"),
         layout.Cell(
-          heading: Some("cell 2"),
-          style: Style(
-            dimensions: Percent(width: 50, height: 100),
-            border: Some(style.BorderSingle),
-          ),
+          content: "cell 2",
+          style: Style(dimensions: Percent(width: 50, height: 100)),
         ),
       ),
       #(
         Section("Row2"),
         layout.Row(
-          heading: Some("row 1"),
-          style: Style(
-            dimensions: Percent(width: 100, height: 50),
-            border: Some(style.BorderSingle),
-          ),
+          content: "row 1",
+          style: Style(dimensions: Percent(width: 100, height: 50)),
           children: [],
         ),
       ),
@@ -71,8 +57,8 @@ pub fn percent_layout_test() {
   let expected =
     "
 ┌──────────────────────────────────────────────────────────────────────────────┐
-│┌row 1───────────────────────────────────────────────────────────────────────┐│
-││┌cell 1──────────────────────────────┐┌cell 2──────────────────────────────┐││
+│row 1────────────────────────────────────────────────────────────────────────┐│
+││cell 1───────────────────────────────┐cell 2───────────────────────────────┐││
 │││                                    ││                                    │││
 │││                                    ││                                    │││
 │││                                    ││                                    │││
@@ -80,7 +66,7 @@ pub fn percent_layout_test() {
 │││                                    ││                                    │││
 ││└────────────────────────────────────┘└────────────────────────────────────┘││
 │└────────────────────────────────────────────────────────────────────────────┘│
-│┌row 1───────────────────────────────────────────────────────────────────────┐│
+│row 1────────────────────────────────────────────────────────────────────────┐│
 ││                                                                            ││
 ││                                                                            ││
 ││                                                                            ││