feat: Update layout ✨

Author: kdheepak

Project.toml

@@ -7,7 +7,6 @@ version = "0.6.0"
 Crayons = "a8cc5b0e-0ffa-5ad4-8c14-923d3ee1735f"
 Crossterm = "89a1a94d-67fa-4c27-8677-ab6d33b1ad6c"
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
-GLPK = "60bf3e95-4087-53dc-ae20-288a0d20c6a6"
 InlineTest = "bd334432-b1e7-49c7-a2dc-dd9149e4ebd6"
 KiwiConstraintSolver = "063317df-b1e6-4e84-b689-d7ba7b3726e4"
 Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"

examples/layout.jl

@@ -42,9 +42,7 @@ function TUI.init!(m, _)
 end
 
 function TUI.update!(m::Model, evt::TUI.KeyEvent)
-  if TUI.keypress(evt) == "q"
-    m.quit = true
-  end
+  m.quit = true
 end
 
 function TUI.view(m::Model)
@@ -53,8 +51,8 @@ function TUI.view(m::Model)
   block3 = TUI.Block(; title = "Block 3")
 
   horizontal1 = TUI.Layout(;
-    widgets = [block1, block2, block3],
-    constraints = [TUI.Percent(30), TUI.Max(5), TUI.Percent(30)],
+    widgets = [block1, block2],
+    constraints = [TUI.Percent(50), TUI.Percent(50)],
     orientation = :horizontal,
   )
   horizontal2 = TUI.Layout(;

src/TerminalUserInterfaces.jl

@@ -6,7 +6,6 @@ using Crayons
 using TextWrap
 using Unicode
 using InlineTest
-using GLPK
 using KiwiConstraintSolver
 
 export Terminal

src/layout.jl

@@ -126,46 +126,58 @@ function split(layout::Union{Horizontal,Vertical}, area::Rect)
     add_constraint(s, variables[i].h <= area.height)
     if c isa Auto
       if orientation == :horizontal
-        add_constraint(s, KiwiConstraintSolver.Constraint(variables[i].w - c.value, KiwiConstraintSolver.STRONG, :(==)))
+        add_constraint(s, @constraint variables[i].w == c.value - 1 strength = KiwiConstraintSolver.STRONG)
       else
-        add_constraint(s, KiwiConstraintSolver.Constraint(variables[i].h - c.value, KiwiConstraintSolver.STRONG, :(==)))
+        add_constraint(s, @constraint variables[i].h == c.value - 1 strength = KiwiConstraintSolver.STRONG)
       end
     elseif c isa Percent
       if orientation == :horizontal
         add_constraint(
           s,
-          KiwiConstraintSolver.Constraint(variables[i].w - (c.value ÷ width(area)), KiwiConstraintSolver.MEDIUM, :(==)),
+          @constraint variables[i].w == (c.value * width(area) ÷ 100) - 1 strength = KiwiConstraintSolver.MEDIUM
         )
       else
         add_constraint(
           s,
-          KiwiConstraintSolver.Constraint(
-            variables[i].h - (c.value ÷ height(area)),
-            KiwiConstraintSolver.MEDIUM,
-            :(==),
-          ),
+          @constraint variables[i].h == (c.value * height(area) ÷ 100) - 1 strength = KiwiConstraintSolver.MEDIUM
         )
       end
     elseif c isa Fixed
       if orientation == :horizontal
-        add_constraint(s, variables[i].w == c.value)
+        add_constraint(s, variables[i].w == c.value - 1)
       else
-        add_constraint(s, variables[i].h == c.value)
+        add_constraint(s, variables[i].h == c.value - 1)
       end
     elseif c isa Min
       if orientation == :horizontal
-        add_constraint(s, variables[i].w >= c.value)
+        add_constraint(s, variables[i].w >= c.value - 1)
       else
-        add_constraint(s, variables[i].h >= c.value)
+        add_constraint(s, variables[i].h >= c.value - 1)
       end
     elseif c isa Max
       if orientation == :horizontal
-        add_constraint(s, variables[i].w <= c.value)
+        add_constraint(s, variables[i].w <= c.value - 1)
       else
-        add_constraint(s, variables[i].h <= c.value)
+        add_constraint(s, variables[i].h <= c.value - 1)
       end
     end
   end
+  for (i, c) in enumerate(layout.constraints)
+    if i == 1
+      continue
+    end
+    if orientation == :horizontal
+      add_constraint(
+        s,
+        @constraint variables[i].x == variables[i-1].x + variables[i-1].w + 1 strength = KiwiConstraintSolver.MEDIUM
+      )
+    else
+      add_constraint(
+        s,
+        @constraint variables[i].y == variables[i-1].y + variables[i-1].h + 1 strength = KiwiConstraintSolver.MEDIUM
+      )
+    end
+  end
   if orientation == :horizontal
     add_constraint(s, sum(variables[i].w for (i, c) in enumerate(layout.constraints)) == area.width)
   else

src/terminal.jl

@@ -251,15 +251,15 @@ area(t::Terminal) = t.terminal_size[]
 
 function tui(f::Function; flags...)
   r = nothing
-  err = nothing
   tui(true; flags...)
   try
     r = f()
   catch err
+    tui(false; flags...)
+    rethrow(err)
   finally
     tui(false; flags...)
   end
-  !isnothing(err) && throw(err)
   return r
 end