Add horizontal scrolling

Several variables are now Vec2 instead of float (eg Mouse.wheelDelta), or tuple of boolean instead of boolean (eg Node.scrollable) to store both horizontal and vertical attributes

Author: alt-tosc

examples/minimal_scroll/minimal_scroll.nim

@@ -10,12 +10,14 @@ proc drawMain() =
       stroke "#000"
       strokeWeight 1
       clipContent true
-      scrollable true
+      scrollable true, true
       fill "#FFF"
       for i in 0 .. 4:
         group "blockA" & $i:
           scrollSpeed (i + 1) * 2 - 6
           box 15 + (float i) * 120, 15, 100, 100
           fill "#2B9FEA"
+          stroke "#000"
+          strokeWeight 1
 
 startFidget(drawMain, w = 620, h = 140)

src/fidget.nim

@@ -280,10 +280,12 @@ proc box*(x, y, w, h: float32) =
   current.box.w = w
   current.box.h = h
 
-  ## Apply scrolling
+  ## Apply scroll
   if not parent.isNil:
-    if parent.scrollable:
-      current.box.y += parent.scroll.y * current.scrollSpeed
+    if parent.scrollable.x:
+      current.box.x += parent.scroll.x * current.scrollSpeed.x
+    if parent.scrollable.y:
+      current.box.y += parent.scroll.y * current.scrollSpeed.y
 
 proc box*(
   x: int|float32|float64,
@@ -363,22 +365,34 @@ proc scrollBars*(scrollBars: bool) =
   ## Causes the parent to clip the children and draw scroll bars.
   current.scrollBars = scrollBars
 
-proc scrollable*(scrollable: bool) =
+proc scrollable*(value: tuple[x: bool, y:bool]) =
   ## Causes the parent to let scroll its children.
-  current.scrollable = scrollable
+  current.scrollable = value
 
   ## Accumulate scroll value
-  if current.scrollable:
+  if current.scrollable.x or current.scrollable.y:
     onHover:
-      current.scroll.y += mouse.wheelDelta
+      current.scroll += mouse.wheelDelta
 
-proc scrollSpeed*(scrollSpeed: float) =
-  ## Sets the speed at which a child is scolled inside its parent's box
-  current.scrollSpeed = scrollSpeed
+proc scrollable*(xValue: bool, yValue: bool) = 
+  ## Causes the parent to let scroll its children.
+  scrollable((x: xValue, y: yValue))
+
+proc scrollable*(yValue: bool) = 
+  ## Causes the parent to let scroll its children.
+  scrollable((x: false, y: yValue))
+
+proc scrollSpeed*(value: Vec2) =
+  ## Sets the speed at which a child is scrolled inside its parent's box
+  current.scrollSpeed = value
+
+proc scrollSpeed*(value: int|float32|float64) =
+  ## Sets the speed at which a child is scrolled inside its parent's box
+  scrollSpeed(vec2(float32 value, float32 value))
 
-proc scrollSpeed*(scrollSpeed: int) =
-  ## Sets the speed at which a child is scolled inside its parent's box
-  current.scrollSpeed = float scrollSpeed
+proc scrollSpeed*(xValue, yValue: int|float32|float64) =
+  ## Sets the speed at which a child is scrolled inside its parent's box
+  scrollSpeed(vec2(float32 xValue, float32 yValue))
 
 proc cursorColor*(color: Color) =
   ## Sets the color of the text cursor.

src/fidget/common.nim

@@ -142,9 +142,9 @@ type
     textLayoutWidth*: float32
     ## Can the text be selected.
     selectable*: bool
-    scrollable*: bool
+    scrollable*: tuple[x: bool, y: bool]
     scroll*: Vec2
-    scrollSpeed*: float
+    scrollSpeed*: Vec2
     scrollBars*: bool ## Should it have scroll bars if children are clipped.
 
   KeyState* = enum
@@ -163,7 +163,7 @@ type
   Mouse* = ref object
     pos*, delta*, prevPos*: Vec2
     pixelScale*: float32
-    wheelDelta*: float32
+    wheelDelta*: Vec2
     cursorStyle*: MouseCursorStyle ## Sets the mouse cursor icon
     prevCursorStyle*: MouseCursorStyle
 
@@ -323,7 +323,7 @@ proc resetToDefault*(node: Node)=
   node.clipContent = false
   node.diffIndex = 0
   node.selectable = false
-  node.scrollSpeed = 1
+  node.scrollSpeed = vec2(1, 1)
 
 proc setupRoot*() =
   if root == nil:
@@ -339,7 +339,7 @@ proc setupRoot*() =
 
 proc clearInputs*() =
 
-  mouse.wheelDelta = 0
+  mouse.wheelDelta = vec2(0, 0)
 
   # Reset key and mouse press to default state
   for i in 0 ..< buttonPress.len:

src/fidget/opengl/base.nim

@@ -274,7 +274,7 @@ proc onScroll(window: staticglfw.Window, xoffset, yoffset: float64) {.cdecl.} =
   if keyboard.focusNode != nil:
     textBox.scrollBy(-yoffset * 50)
   else:
-    mouse.wheelDelta += yoffset
+    mouse.wheelDelta += vec2(xoffset, yoffset)
 
 proc onMouseButton(
   window: staticglfw.Window, button, action, modifiers: cint