Merge branch 'main' of github.com:elcritch/figuro

Author: elcritch

.github/workflows/build-full.yml

@@ -17,25 +17,25 @@ jobs:
           - windows-latest
     steps:
     - uses: actions/checkout@v1
-      with:
-        path: "figuro/"
+
     - uses: iffy/install-nim@v4
       with:
         version: ${{ matrix.nimversion }}
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Cache packages
+      uses: actions/cache@v3
+      with:
+        path: ~/.nimble
+        key: ${{ runner.os }}-${{ hashFiles('figuro.nimble') }}
+
     - name: Install Nimble
       run: |
         nimble install nimble
         nim -v
         nimble -v
 
-    - name: Cache packages
-      uses: actions/cache@v3
-      with:
-        path: vendor
-        key: ${{ runner.os }}-${{ hashFiles('figuro/atlas.lock') }}
-
     - name: Install Deps
       run: |
         # sync deps

.github/workflows/build-pr.yml

@@ -14,14 +14,19 @@ jobs:
           - ubuntu-latest
     steps:
     - uses: actions/checkout@v1
-      with:
-        path: "fig_ws/"
+
     - uses: iffy/install-nim@v4
       with:
         version: ${{ matrix.nimversion }}
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+    - name: Cache packages
+      uses: actions/cache@v3
+      with:
+        path: ~/.nimble
+        key: ${{ runner.os }}-${{ hashFiles('figuro.nimble') }}
+
     - name: Install Nimble
       run: |
         nimble install nimble
@@ -33,10 +38,6 @@ jobs:
         # new atlas workspace
         nimble install -d --verbose
 
-    - name: Test build From fig_ws/
-      run: |
-        nim c figuro/tests/tclick.nim
-
     - name: Build Tests
       run: |
         cd figuro/

README.md

@@ -10,6 +10,12 @@ A GUI toolkit for Nim that is event driven while being small and fast. It tries
 Example drawing buttons with a fading background when any of them are hovered (see below for how it works):
 
 ```nim
+import figuro/widgets/button
+import figuro/widgets/horizontal
+import figuro/widget
+import figuro/ui/animations
+import figuro
+
 let
   typeface = loadTypeFace("IBMPlexSans-Regular.ttf")
   font = UiFont(typefaceId: typeface, size: 22)
@@ -21,6 +27,7 @@ type
 
 proc update*(fig: Main) {.signal.}
 
+
 proc btnTick*(self: Button[int]) {.slot.} =
   ## slot to increment a button on every tick 
   self.state.inc
@@ -34,7 +41,7 @@ proc btnClicked*(self: Button[int],
   ## which we can use to check if it's a mouse click
   if buttons == {MouseLeft} or buttons == {DoubleClick}:
     if kind == Enter:
-      self.state.inc()
+      self.state.inc
       refresh(self)
 
 proc btnHover*(self: Main, evtKind: EventKind) {.slot.} =
@@ -45,13 +52,12 @@ proc btnHover*(self: Main, evtKind: EventKind) {.slot.} =
 proc draw*(self: Main) {.slot.} =
   ## draw slot for Main widget called whenever an event
   ## triggers a node or it's parents to be refreshed
+  var node = self
+  node.setName "main"
 
-  self.setName "main"
-
-  # Calls the widget template `rectangle` which creates a new basic widget node.
-  # Generally used to draw generic boxes.
-  # Here we need to pass the `parent` argument since there's no current `node` set
-  rectangle "body", parent=self:
+  # Calls the widget template `rectangle`.
+  # This creates a new basic widget node. Generally used to draw generic rectangles.
+  rectangle "body":
     with node:
       # sets the bounding box of this node
       box 10'ux, 10'ux, 600'ux, 120'ux
@@ -60,7 +66,7 @@ proc draw*(self: Main) {.slot.} =
       fill whiteColor.darken(self.bkgFade.amount)
 
     # sets up horizontal widget node with alternate syntax
-    horizontal "horiz":
+    Horizontal.new "horiz":
       with node:
         box 10'ux, 0'ux, 100'pp, 100'pp
         # `itemWidth` is needed to set the width of items
@@ -69,11 +75,11 @@ proc draw*(self: Main) {.slot.} =
         layoutItems justify=CxCenter, align=CxCenter
 
       for i in 0 .. 4:
-        buttonOf[int] "btn", captures=[i]:
-          # widgets with generic type like Button can use `<name>Of[T]` to set the generic type, otherwise void is used
+        Button[int].new("btn", captures=i):
           let btn = node
           with node:
             size 100'ux, 100'ux
+            cornerRadius 5.0
             connect(doHover, self, btnHover)
             connect(doClick, node, btnClicked)
           if i == 0:
@@ -84,13 +90,13 @@ proc draw*(self: Main) {.slot.} =
               fill blackColor
               setText({font: $(btn.state)}, Center, Middle)
 
+
 proc tick*(self: Main, tick: int, time: MonoTime) {.slot.} =
-  ## handles background "fade" when buttons are hovered
   self.bkgFade.tick(self)
   emit self.update()
 
 var main = Main.new()
-let frame = newAppFrame(main, size=(400'ui, 140'ui))
+let frame = newAppFrame(main, size=(700'ui, 200'ui))
 startFiguro(frame)
 ```
 

figuro.nimble

@@ -6,7 +6,7 @@ srcDir        = "."
 
 # Dependencies
 
-requires "nim >= 1.6.5"
+# requires "nim >= 2.0.12"
 requires "pixie >= 5.0.1"
 requires "cssgrid >= 0.6.1"
 requires "chroma >= 0.2.7"

figuro/common/nodes/ui.nim

@@ -120,7 +120,7 @@ template toRef*(fig: FiguroWeakRef): auto =
 proc hash*(a: AppFrame): Hash =
   a.root.hash()
 
-proc new*[T: Figuro](tp: typedesc[T]): T =
+proc newFiguro*[T: Figuro](tp: typedesc[T]): T =
   result = T()
   result.debugId = nextAgentId()
   result.uid = result.debugId
@@ -223,7 +223,7 @@ template connect*(
     b: Figuro,
     slot: typed,
     acceptVoidSlot: static bool = false,
-) =
+): void =
   ## template override
   when signalName(signal) == "doClick":
     a.listens.signals.incl {evClick, evClickOut}

figuro/meta/agents.nim

@@ -238,7 +238,7 @@ proc addAgentListeners*(obj: Agent,
                         sig: string,
                         tgt: Agent,
                         slot: AgentProc
-                        ) =
+                        ): void =
 
   # echo "add agent listener: ", sig, " obj: ", obj.debugId, " tgt: ", tgt.debugId
   # if obj.listeners.hasKey(sig):

figuro/meta/signals.nim

@@ -120,8 +120,8 @@ proc getSignalName*(signal: NimNode): NimNode =
     result = newStrLitNode signal.strVal
     # echo "getSignalName:result: ", result.treeRepr
 
-macro signalName*(signal: untyped): untyped =
-  result = getSignalName(signal)
+macro signalName*(signal: untyped): string =
+  getSignalName(signal)
 
 proc splitNamesImpl(slot: NimNode): Option[(NimNode, NimNode)] =
   # echo "splitNamesImpl: ", slot.treeRepr
@@ -161,7 +161,7 @@ macro signalType*(s: untyped): auto =
   for arg in obj[2..^1]:
     result.add arg[1]
 
-proc getAgentProcTy[T](tp: AgentProcTy[T]): T =
+proc getAgentProcTy*[T](tp: AgentProcTy[T]): T =
   discard
 
 template connect*[T](
@@ -170,7 +170,7 @@ template connect*[T](
     b: Agent,
     slot: Signal[T],
     acceptVoidSlot: static bool = false,
-) =
+): void =
   ## sets up `b` to recieve events from `a`. Both `a` and `b`
   ## must subtype `Agent`. The `signal` must be a signal proc, 
   ## while `slot` must be a slot proc.
@@ -196,8 +196,8 @@ template connect*[T](
               b, setValue)
       emit a.valueChanged(137) #=> prints "setValue! 137"
 
-  let agentSlot = slot
-  # static:
+  # let agentSlot: Signal[T] = slot
+  # # static:
   block:
     ## statically verify signal / slot types match
     # echo "TYP: ", repr typeof(SignalTypes.`signal`(typeof(a)))
@@ -207,15 +207,15 @@ template connect*[T](
       discard
     else:
       signalType = slotType
-  a.addAgentListeners(signalName(signal), b, agentSlot)
+  a.addAgentListeners(signalName(signal), b, slot)
 
 template connect*(
     a: Agent,
     signal: typed,
     b: Agent,
     slot: typed,
     acceptVoidSlot: static bool = false,
-) =
+): void =
   let agentSlot = `slot`(typeof(b))
   block:
     ## statically verify signal / slot types match

figuro/ui/apis.nim

@@ -7,8 +7,11 @@ import std/[hashes]
 
 import commons, core
 
+from std/sugar import capture
+
 export core, cssgrid, stack_strings
 export with
+export capture
 
 # template nodes*[T](fig: T, blk: untyped): untyped =
 #   ## begin drawing nodes
@@ -86,13 +89,13 @@ proc boxFrom*(current: Figuro, x, y, w, h: float32) =
 #   ## Note: Experimental!
 #   nodeImpl(nkDrawable, id, inner)
 
-template rectangle*(id: static string, args: varargs[untyped]): untyped =
+template rectangle*(name: string, blk: untyped): auto =
   ## Starts a new rectangle.
-  nodeImpl(nkRectangle, id, args)
+  widget[BasicFiguro](nkRectangle, name, blk)
 
-template text*(id: string, inner: untyped): untyped =
+template text*(name: string, blk: untyped): auto =
   ## Starts a new rectangle.
-  nodeImpl(nkText, id, inner)
+  widget[BasicFiguro](nkText, name, blk)
 
 ## ---------------------------------------------
 ##             Fidget Node APIs
@@ -472,15 +475,17 @@ proc gridTemplateDebugLines*(node: Figuro, grid: Figuro, color: Color = blueColo
       let w = grid.gridTemplate.columns[^1].start.UICoord
       let h = grid.gridTemplate.rows[^1].start.UICoord
       for col in grid.gridTemplate.columns[1..^2]:
-        rectangle "column", captures=col:
-          with node:
-            fill color
-            box ux(col.start.UICoord - wd), 0'ux, wd.ux(), h.ux()
+        capture col:
+          rectangle "column":
+            with node:
+              fill color
+              box ux(col.start.UICoord - wd), 0'ux, wd.ux(), h.ux()
       for row in grid.gridTemplate.rows[1..^2]:
-        rectangle "row", captures=row:
-          with node:
-            fill color
-            box 0, row.start.UICoord - wd, w.UICoord, wd
+        capture row:
+          rectangle "row":
+            with node:
+              fill color
+              box 0, row.start.UICoord - wd, w.UICoord, wd
       rectangle "edge":
         with node:
           fill color.darken(0.5)