Improvements v12.9 add padding (#91)

* tweaks
* padding
* tweak button
* tweak button
* improve handling of min/max content in children
* fix 2.0.x compilation issue
* fix 2.0.x compilation issue - test 2.0.x version

Author: elcritch

.github/workflows/build-full.yml

@@ -10,6 +10,7 @@ jobs:
       matrix:
         nimversion:
           - '2.x'
+          - '2.0.14'
 
         os:
           - ubuntu-latest

.github/workflows/build-pr.yml

@@ -10,6 +10,7 @@ jobs:
       matrix:
         nimversion:
           - '2.x'
+          - '2.0.14'
         os:
           - ubuntu-latest
     steps:

examples/hnbrowser.nim

@@ -100,16 +100,25 @@ proc draw*(self: Main) {.slot.} =
           offset 2'pp, 2'pp
           cornerRadius 7.0'ux
           size 96'pp, 90'pp
+          echo "\n"
+          printLayout(this, cmTerminal)
 
           Vertical.new "items":
             with this:
-              contentHeight cx"min-content", 3'ui
+              contentHeight cx"max-content", 3'ui
 
             for idx, story in self.stories:
-              capture story:
-                Button.new "story":
+              # if idx > 5: break
+              capture story, idx:
+                Button.new "story" & $idx:
+                  onSignal(doRightClick) do(this: Button[tuple[]]):
+                    printLayout(this, cmTerminal)
                   with this:
-                    size 1'fr, ux(2*lh)
+                    # size 1'fr, ux(2*lh)
+                    size 1'fr, max(ux(2.0*lh.float), cx"min-content")
+                  # this.cxPadOffset[drow] = 20'ux
+                  # this.cxPadSize[drow] = 20'ux
+
                   Text.new "text":
                     with this:
                       size 1'fr, ux(2*lh)
@@ -119,7 +128,6 @@ proc draw*(self: Main) {.slot.} =
                       justify Left
                       align Middle
                       text({font: $story.link.title})
-          # printLayout(this, cmTerminal)
 
 var main = Main(name: "main")
 var frame = newAppFrame(main, size=(600'ui, 280'ui))

figuro.nimble

@@ -1,4 +1,4 @@
-version       = "0.12.8"
+version       = "0.12.9"
 author        = "Jaremy Creechley"
 description   = "UI Engine for Nim"
 license       = "MIT"
@@ -9,7 +9,7 @@ srcDir        = "src"
 requires "nim >= 2.0.10"
 requires "sigils >= 0.11.8"
 requires "pixie >= 5.0.1"
-requires "cssgrid >= 0.9.4"
+requires "cssgrid >= 0.9.8"
 requires "chroma >= 0.2.7"
 requires "bumpy"
 requires "pretty"

src/figuro/common/nodes/uinodes.nim

@@ -59,7 +59,7 @@ type
     nIndex*: int
     diffIndex*: int
 
-    box*: Box
+    box*, bpad*: Box
     bmin*, bmax*: Size
     screenBox*: Box
     offset*: Position
@@ -72,6 +72,8 @@ type
 
     cxSize*: array[GridDir, Constraint] = [csAuto(), csAuto()]
     cxOffset*: array[GridDir, Constraint] = [csAuto(), csAuto()]
+    cxPadSize*: array[GridDir, Constraint] = [csAuto(), csAuto()]
+    cxPadOffset*: array[GridDir, Constraint] = [csAuto(), csAuto()]
     cxMin*: array[GridDir, Constraint] = [csNone(), csNone()]
     cxMax*: array[GridDir, Constraint] = [csNone(), csNone()]
 

src/figuro/renderer/opengl.nim

@@ -98,9 +98,11 @@ proc configureWindowEvents(renderer: Renderer) =
     uxInput.mouse.prev = prevPos.descaled()
     uxInput.mouse.consumed = false
     lastMouse = uxInput.mouse
-    let res = renderer.uxInputList.trySend(uxInput)
-    if res == false:
-      echo "warning: mouse event blocked!"
+    if not renderer.uxInputList.trySend(uxInput):
+      info "warning: mouse event blocked!"
+
+  window.onFocusChange = proc() =
+    warn "onFocusChange"
 
   window.onScroll = proc() =
     var uxInput = AppInputs(mouse: lastMouse)

src/figuro/runtime/runtimeCore.nim

@@ -58,7 +58,7 @@ proc tick*(self: AppTicker) {.slot.} =
     os.sleep(self.period.inMilliseconds)
 
 proc updateTheme*(self: AppFrame, css: CssTheme) {.slot.} =
-  debug "CSS theme into app", numberOfCssRules = css.rules().toSeq().len()
+  debug "CSS theme into app", numberOfCssRules = rules(css).toSeq().len()
   self.theme.css = css
   refresh(self.root)
 

src/figuro/runtime/utils/cssMonitor.nim

@@ -52,10 +52,10 @@ when not defined(noFiguroDmonMonitor):
     proc update(file: string) =
       let css = loadTheme(file)
       if css != nil:
-        notice "CSS Updated: ", file = file, css = css.rules().toSeq.len()
+        notice "CSS Updated: ", file = file, css = rules(css).toSeq.len()
         emit self.cssUpdate(css)
         os.sleep(16) # TODO: fixme: this is a hack to ensure proper text resizing 
-        notice "CSS Updated: second: ", file = file, css = css.rules().toSeq.len()
+        notice "CSS Updated: second: ", file = file, css = rules(css).toSeq.len()
         emit self.cssUpdate(css)
 
     let cssFiles = @[defaultTheme, appFile]

src/figuro/ui/apisImpl.nim

@@ -173,9 +173,9 @@ template onHover*(current: Figuro, inner: untyped) =
   if evHover in current.events:
     inner
 
-template onHover*(inner: untyped) =
-  ## Sets and onHover behavior.
-  onHover(node, inner)
+# template onHover*(inner: untyped) =
+#   ## Sets and onHover behavior.
+#   onHover(node, inner)
 
 proc getTitle*(current: Figuro): string =
   ## Gets window title

src/figuro/ui/cssengine.nim

@@ -222,5 +222,5 @@ proc applyThemeRules*(node: Figuro) =
   if skipCss in node.attrs:
     return
   let node = if node of Text: node.parent[] else: node
-  for rule in node.frame[].theme.css.rules():
+  for rule in rules(node.frame[].theme.css):
     rule.eval(node)