feat: Update layout ✨

Author: kdheepak

examples/layout.jl

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

src/layout.jl

@@ -120,45 +120,45 @@ function split(layout::Union{Horizontal,Vertical}, area::Rect)
   ]
   s = Solver()
   for (i, c) in enumerate(layout.constraints)
-    add_constraint(s, variables[i].x >= 1)
-    add_constraint(s, variables[i].y >= 1)
+    add_constraint(s, variables[i].x >= area.x)
+    add_constraint(s, variables[i].y >= area.y)
     add_constraint(s, variables[i].w <= area.width)
     add_constraint(s, variables[i].h <= area.height)
     if c isa Auto
       if orientation == :horizontal
-        add_constraint(s, @constraint variables[i].w == c.value - 1 strength = KiwiConstraintSolver.STRONG)
+        add_constraint(s, @constraint variables[i].w == c.value strength = KiwiConstraintSolver.STRONG)
       else
-        add_constraint(s, @constraint variables[i].h == c.value - 1 strength = KiwiConstraintSolver.STRONG)
+        add_constraint(s, @constraint variables[i].h == c.value strength = KiwiConstraintSolver.STRONG)
       end
     elseif c isa Percent
       if orientation == :horizontal
         add_constraint(
           s,
-          @constraint variables[i].w == (c.value * width(area) ÷ 100) - 1 strength = KiwiConstraintSolver.MEDIUM
+          @constraint variables[i].w == (c.value * width(area) ÷ 100) strength = KiwiConstraintSolver.MEDIUM
         )
       else
         add_constraint(
           s,
-          @constraint variables[i].h == (c.value * height(area) ÷ 100) - 1 strength = KiwiConstraintSolver.MEDIUM
+          @constraint variables[i].h == (c.value * height(area) ÷ 100) strength = KiwiConstraintSolver.MEDIUM
         )
       end
     elseif c isa Fixed
       if orientation == :horizontal
-        add_constraint(s, variables[i].w == c.value - 1)
+        add_constraint(s, variables[i].w == c.value)
       else
-        add_constraint(s, variables[i].h == c.value - 1)
+        add_constraint(s, variables[i].h == c.value)
       end
     elseif c isa Min
       if orientation == :horizontal
-        add_constraint(s, variables[i].w >= c.value - 1)
+        add_constraint(s, variables[i].w >= c.value)
       else
-        add_constraint(s, variables[i].h >= c.value - 1)
+        add_constraint(s, variables[i].h >= c.value)
       end
     elseif c isa Max
       if orientation == :horizontal
-        add_constraint(s, variables[i].w <= c.value - 1)
+        add_constraint(s, variables[i].w <= c.value)
       else
-        add_constraint(s, variables[i].h <= c.value - 1)
+        add_constraint(s, variables[i].h <= c.value)
       end
     end
   end
@@ -179,28 +179,23 @@ function split(layout::Union{Horizontal,Vertical}, area::Rect)
     end
   end
   if orientation == :horizontal
-    add_constraint(s, sum(variables[i].w for (i, c) in enumerate(layout.constraints)) == area.width)
+    add_constraint(s, sum(variables[i].w for (i, c) in enumerate(layout.constraints)) == width(area))
   else
-    add_constraint(s, sum(variables[i].h for (i, c) in enumerate(layout.constraints)) == area.height)
+    add_constraint(s, sum(variables[i].h for (i, c) in enumerate(layout.constraints)) == height(area))
   end
   for (i, c1) in enumerate(layout.constraints), (j, c2) in enumerate(layout.constraints)
     if j <= i
       continue
     end
     if orientation == :horizontal
-      add_constraint(
-        s,
-        KiwiConstraintSolver.Constraint(variables[i].w - variables[j].w, KiwiConstraintSolver.WEAK, :(==)),
-      )
+      add_constraint(s, @constraint variables[i].w == variables[j].w strength = KiwiConstraintSolver.WEAK)
     else
-      add_constraint(
-        s,
-        KiwiConstraintSolver.Constraint(variables[i].h - variables[j].h, KiwiConstraintSolver.WEAK, :(==)),
-      )
+      add_constraint(s, @constraint variables[i].h == variables[j].h strength = KiwiConstraintSolver.WEAK)
     end
   end
   update_variables(s)
-  [Rect(round(v.x.value), round(v.y.value), round(v.w.value), round(v.h.value)) for v in variables]
+  rects = [Rect(round(v.x.value), round(v.y.value), round(v.w.value), round(v.h.value)) for v in variables]
+  rects
 end
 
 @testset "layout-rects" begin

src/widgets/layout.jl

@@ -16,7 +16,7 @@ function render(layout::Layout, area::Rect, buf::Buffer)
     split(Horizontal(; constraints = layout.constraints), area)
   end
 
-  for (widget, rect) in zip(layout.widgets, rects)
+  for (i, (widget, rect)) in enumerate(zip(layout.widgets, rects))
     render(widget, rect, buf)
   end
 end