From 00eb9b15e71b45707f046f7676459dbb45c89b5a Mon Sep 17 00:00:00 2001
From: Jaremy Creechley <creechley@gmail.com>
Date: Sat, 19 Feb 2022 18:57:33 -0800
Subject: [PATCH 1/7] tweak size for high dpi

---
 examples/demo/demo.nim       |  8 ++++----
 src/fidget.nim               | 30 +++++++++++++++---------------
 src/fidget/openglbackend.nim |  2 ++
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/examples/demo/demo.nim b/examples/demo/demo.nim
index ccbe3871..b168c0ad 100644
--- a/examples/demo/demo.nim
+++ b/examples/demo/demo.nim
@@ -122,7 +122,7 @@ proc basicControls() =
     strokeWeight 1
     rectangle "fill":
       progress = selectedButton.len / 5 * 100
-      box 2, 2, int((parent.box.w - 4) * (progress/100)), 8
+      box 2, 2, clamp(int((parent.box.w/3.0 - 4) * (progress/100)), 1, parent.box.w.int), 8
       fill "#9fe7f8"
       cornerRadius 5
 
@@ -173,8 +173,8 @@ proc basicControls() =
     onClick:
       pipDrag = true
     if pipDrag:
-      pipPos = int(mouse.pos.x - current.screenBox.x)
-      pipPos = clamp(pipPos, 0, 240)
+      pipPos = int(mouse.pos.x/3.0 - current.screenBox.x/3.0)
+      pipPos = clamp(pipPos, 1, 240)
       pipDrag = buttonDown[MOUSE_LEFT]
     rectangle "pip":
       box pipPos, 0, 10, 10
@@ -401,4 +401,4 @@ proc drawMain() =
       of "Constraints":
         basicConstraints()
 
-startFidget(drawMain, w = 530, h = 300)
+startFidget(drawMain, w = 530, h = 300, pixelScale=1.0)
diff --git a/src/fidget.nim b/src/fidget.nim
index 4c439815..97b1eaea 100644
--- a/src/fidget.nim
+++ b/src/fidget.nim
@@ -222,9 +222,9 @@ proc font*(
 ) =
   ## Sets the font.
   current.textStyle.fontFamily = fontFamily
-  current.textStyle.fontSize = fontSize
-  current.textStyle.fontWeight = fontWeight
-  current.textStyle.lineHeight = lineHeight
+  current.textStyle.fontSize = 3*fontSize
+  current.textStyle.fontWeight = 3*fontWeight
+  current.textStyle.lineHeight = if lineHeight != 0.0: 3*lineHeight else: 3*fontSize
   current.textStyle.textAlignHorizontal = textAlignHorizontal
   current.textStyle.textAlignVertical = textAlignVertical
 
@@ -234,15 +234,15 @@ proc fontFamily*(fontFamily: string) =
 
 proc fontSize*(fontSize: float32) =
   ## Sets the font size in pixels.
-  current.textStyle.fontSize = fontSize
+  current.textStyle.fontSize = fontSize*3.0
 
 proc fontWeight*(fontWeight: float32) =
   ## Sets the font weight.
-  current.textStyle.fontWeight = fontWeight
+  current.textStyle.fontWeight = 3*fontWeight
 
 proc lineHeight*(lineHeight: float32) =
   ## Sets the font size.
-  current.textStyle.lineHeight = lineHeight
+  current.textStyle.lineHeight = 3*lineHeight
 
 proc textAlign*(textAlignHorizontal: HAlign, textAlignVertical: VAlign) =
   ## Sets the horizontal and vertical alignment.
@@ -268,17 +268,17 @@ proc image*(imageName: string) =
 
 proc orgBox*(x, y, w, h: int|float32|float32) =
   ## Sets the box dimensions of the original element for constraints.
-  current.orgBox.x = float32 x
-  current.orgBox.y = float32 y
-  current.orgBox.w = float32 w
-  current.orgBox.h = float32 h
+  current.orgBox.x =3.0* float32 x
+  current.orgBox.y =3.0* float32 y
+  current.orgBox.w =3.0* float32 w
+  current.orgBox.h =3.0* float32 h
 
 proc box*(x, y, w, h: float32) =
   ## Sets the box dimensions.
-  current.box.x = x
-  current.box.y = y
-  current.box.w = w
-  current.box.h = h
+  current.box.x = 3.0*x
+  current.box.y = 3.0*y
+  current.box.w = 3.0*w
+  current.box.h = 3.0*h
 
 proc box*(
   x: int|float32|float64,
@@ -341,7 +341,7 @@ proc zLevel*(zLevel: int) =
 
 proc cornerRadius*(a, b, c, d: float32) =
   ## Sets all radius of all 4 corners.
-  current.cornerRadius = (a, b, c, d)
+  current.cornerRadius = (3*a, 3*b, 3*c, 3*d)
 
 proc cornerRadius*(radius: float32) =
   ## Sets all radius of all 4 corners.
diff --git a/src/fidget/openglbackend.nim b/src/fidget/openglbackend.nim
index e4c7c481..ccc4b087 100644
--- a/src/fidget/openglbackend.nim
+++ b/src/fidget/openglbackend.nim
@@ -58,6 +58,8 @@ proc focus*(keyboard: Keyboard, node: Node) =
     var font = fonts[node.textStyle.fontFamily]
     font.size = node.textStyle.fontSize
     font.lineHeight = node.textStyle.lineHeight
+    # if font.lineHeight == 0:
+      # font.lineHeight = font.size
     keyboard.input = node.text
     textBox = newTextBox(
       font,

From 95376b40fdeec662623037c28109fc9de723f421 Mon Sep 17 00:00:00 2001
From: Jaremy Creechley <creechley@gmail.com>
Date: Sat, 19 Feb 2022 23:05:23 -0800
Subject: [PATCH 2/7] tweak size for high dpi

---
 src/fidget.nim | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/fidget.nim b/src/fidget.nim
index 97b1eaea..85e0f4e1 100644
--- a/src/fidget.nim
+++ b/src/fidget.nim
@@ -268,10 +268,10 @@ proc image*(imageName: string) =
 
 proc orgBox*(x, y, w, h: int|float32|float32) =
   ## Sets the box dimensions of the original element for constraints.
-  current.orgBox.x =3.0* float32 x
-  current.orgBox.y =3.0* float32 y
-  current.orgBox.w =3.0* float32 w
-  current.orgBox.h =3.0* float32 h
+  current.orgBox.x = 3.0 * float32 x
+  current.orgBox.y = 3.0 * float32 y
+  current.orgBox.w = 3.0 * float32 w
+  current.orgBox.h = 3.0 * float32 h
 
 proc box*(x, y, w, h: float32) =
   ## Sets the box dimensions.

From 35f17dc74a419574c5da32554afb4ed90b6214c4 Mon Sep 17 00:00:00 2001
From: Jaremy Creechley <creechley@gmail.com>
Date: Sat, 19 Feb 2022 23:51:04 -0800
Subject: [PATCH 3/7] add scaled get

---
 examples/demo/demo.nim     | 10 +++++-----
 src/fidget/common.nim      |  5 +++++
 src/fidget/opengl/base.nim |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/examples/demo/demo.nim b/examples/demo/demo.nim
index b168c0ad..32a218e0 100644
--- a/examples/demo/demo.nim
+++ b/examples/demo/demo.nim
@@ -18,7 +18,7 @@ var
 
 proc basicText() =
   frame "autoLayoutText":
-    box 130, 0, root.box.w - 130, 491
+    box 130, 0, root.getScaled(box).w - 130, 491
     fill "#ffffff"
     layout lmVertical
     counterAxisSizingMode csFixed
@@ -303,7 +303,7 @@ proc basicConstraints() =
     # Got to specify orgBox for constraints to work.
     orgBox 0, 0, 400, 400
     # Then grow the normal box.
-    box 130, 0, root.box.w - 130, root.box.h
+    box 130, 0, root.getScaled(box).w - 130, root.getScaled(box).h
     # Constraints will work on the difference between orgBox and box.
     fill "#ffffff"
     rectangle "Center":
@@ -340,12 +340,12 @@ proc drawMain() =
 
   component "iceUI":
     orgBox 0, 0, 530, 185
-    box root.box
+    box root.getScaled(box)
     fill "#ffffff"
 
     group "shadow":
       orgBox 0, 0, 530, 3
-      box 0, 0, root.box.w, 3
+      box 0, 0, root.getScaled(box).w, 3
       rectangle "l1":
         box 0, 0, 530, 1
         constraints cStretch, cMin
@@ -401,4 +401,4 @@ proc drawMain() =
       of "Constraints":
         basicConstraints()
 
-startFidget(drawMain, w = 530, h = 300, pixelScale=1.0)
+startFidget(drawMain, w = 3*530, h = 3*300, pixelScale=1.0)
diff --git a/src/fidget/common.nim b/src/fidget/common.nim
index 5c70be59..94685f53 100644
--- a/src/fidget/common.nim
+++ b/src/fidget/common.nim
@@ -491,3 +491,8 @@ proc computeScreenBox*(parent, node: Node) =
     node.screenBox = node.box + parent.screenBox
   for n in node.nodes:
     computeScreenBox(node, n)
+
+template getScaled*(node: Node, box: untyped): Rect =
+  node.`box`*1/3
+
+
diff --git a/src/fidget/opengl/base.nim b/src/fidget/opengl/base.nim
index 70c186ca..a7615718 100644
--- a/src/fidget/opengl/base.nim
+++ b/src/fidget/opengl/base.nim
@@ -272,7 +272,7 @@ proc onSetKey(
 proc onScroll(window: staticglfw.Window, xoffset, yoffset: float64) {.cdecl.} =
   requestedFrame = true
   if keyboard.focusNode != nil:
-    textBox.scrollBy(-yoffset * 50)
+    textBox.scrollBy(-yoffset * 1)
   else:
     mouse.wheelDelta += yoffset
 

From 7e8c97cb4760d2efab3a11d954a8fe0124a64450 Mon Sep 17 00:00:00 2001
From: Jaremy Creechley <creechley@gmail.com>
Date: Sun, 20 Feb 2022 00:02:49 -0800
Subject: [PATCH 4/7] setup global scaling

---
 examples/demo/demo.nim       |  6 +++---
 src/fidget.nim               | 22 +++++++++++-----------
 src/fidget/common.nim        |  7 +++++--
 src/fidget/openglbackend.nim |  4 +++-
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/examples/demo/demo.nim b/examples/demo/demo.nim
index 32a218e0..258da43a 100644
--- a/examples/demo/demo.nim
+++ b/examples/demo/demo.nim
@@ -122,7 +122,7 @@ proc basicControls() =
     strokeWeight 1
     rectangle "fill":
       progress = selectedButton.len / 5 * 100
-      box 2, 2, clamp(int((parent.box.w/3.0 - 4) * (progress/100)), 1, parent.box.w.int), 8
+      box 2, 2, clamp(int((parent.getScaled(box).w - 4) * (progress/100)), 1, parent.getScaled(box).w.int), 8
       fill "#9fe7f8"
       cornerRadius 5
 
@@ -173,7 +173,7 @@ proc basicControls() =
     onClick:
       pipDrag = true
     if pipDrag:
-      pipPos = int(mouse.pos.x/3.0 - current.screenBox.x/3.0)
+      pipPos = int(mouse.getScaled(pos).x - current.getScaled(screenBox).x)
       pipPos = clamp(pipPos, 1, 240)
       pipDrag = buttonDown[MOUSE_LEFT]
     rectangle "pip":
@@ -401,4 +401,4 @@ proc drawMain() =
       of "Constraints":
         basicConstraints()
 
-startFidget(drawMain, w = 3*530, h = 3*300, pixelScale=1.0)
+startFidget(drawMain, w = 3*530, h = 3*300, uiScale=3.0)
diff --git a/src/fidget.nim b/src/fidget.nim
index 85e0f4e1..d5650798 100644
--- a/src/fidget.nim
+++ b/src/fidget.nim
@@ -222,9 +222,9 @@ proc font*(
 ) =
   ## Sets the font.
   current.textStyle.fontFamily = fontFamily
-  current.textStyle.fontSize = 3*fontSize
-  current.textStyle.fontWeight = 3*fontWeight
-  current.textStyle.lineHeight = if lineHeight != 0.0: 3*lineHeight else: 3*fontSize
+  current.textStyle.fontSize = common.uiScale*fontSize
+  current.textStyle.fontWeight = common.uiScale*fontWeight
+  current.textStyle.lineHeight = if lineHeight != 0.0: common.uiScale*lineHeight else: common.uiScale*fontSize
   current.textStyle.textAlignHorizontal = textAlignHorizontal
   current.textStyle.textAlignVertical = textAlignVertical
 
@@ -268,17 +268,17 @@ proc image*(imageName: string) =
 
 proc orgBox*(x, y, w, h: int|float32|float32) =
   ## Sets the box dimensions of the original element for constraints.
-  current.orgBox.x = 3.0 * float32 x
-  current.orgBox.y = 3.0 * float32 y
-  current.orgBox.w = 3.0 * float32 w
-  current.orgBox.h = 3.0 * float32 h
+  current.orgBox.x = common.uiScale * float32 x
+  current.orgBox.y = common.uiScale * float32 y
+  current.orgBox.w = common.uiScale * float32 w
+  current.orgBox.h = common.uiScale * float32 h
 
 proc box*(x, y, w, h: float32) =
   ## Sets the box dimensions.
-  current.box.x = 3.0*x
-  current.box.y = 3.0*y
-  current.box.w = 3.0*w
-  current.box.h = 3.0*h
+  current.box.x = common.uiScale*x
+  current.box.y = common.uiScale*y
+  current.box.w = common.uiScale*w
+  current.box.h = common.uiScale*h
 
 proc box*(
   x: int|float32|float64,
diff --git a/src/fidget/common.nim b/src/fidget/common.nim
index 94685f53..0002a99a 100644
--- a/src/fidget/common.nim
+++ b/src/fidget/common.nim
@@ -229,6 +229,9 @@ var
   ## Used for HttpCalls
   httpCalls*: Table[string, HttpCall]
 
+  # UI Scale
+  uiScale*: float32 = 1.0
+
 proc newUId*(): string =
   # Returns next numerical unique id.
   inc lastUId
@@ -492,7 +495,7 @@ proc computeScreenBox*(parent, node: Node) =
   for n in node.nodes:
     computeScreenBox(node, n)
 
-template getScaled*(node: Node, box: untyped): Rect =
-  node.`box`*1/3
+template getScaled*(node, box: untyped): untyped =
+  node.`box`/uiScale
 
 
diff --git a/src/fidget/openglbackend.nim b/src/fidget/openglbackend.nim
index ccc4b087..1bc00564 100644
--- a/src/fidget/openglbackend.nim
+++ b/src/fidget/openglbackend.nim
@@ -390,10 +390,12 @@ proc startFidget*(
   msaa = msaaDisabled,
   mainLoopMode: MainLoopMode = RepaintOnEvent,
   pixelate = false,
-  pixelScale = 1.0
+  pixelScale = 1.0,
+  uiScale = 1.0
 ) =
   ## Starts Fidget UI library
   common.fullscreen = fullscreen
+  common.uiScale = uiScale
   if not fullscreen:
     windowSize = vec2(w.float32, h.float32)
   drawMain = draw

From bc3459ad20fb65e1c9817b6f409855cc0a532fc4 Mon Sep 17 00:00:00 2001
From: Jaremy Creechley <creechley@gmail.com>
Date: Sun, 20 Feb 2022 00:06:11 -0800
Subject: [PATCH 5/7] fix text input lineheight

---
 src/fidget.nim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fidget.nim b/src/fidget.nim
index 4c439815..c8ef8e4e 100644
--- a/src/fidget.nim
+++ b/src/fidget.nim
@@ -224,7 +224,7 @@ proc font*(
   current.textStyle.fontFamily = fontFamily
   current.textStyle.fontSize = fontSize
   current.textStyle.fontWeight = fontWeight
-  current.textStyle.lineHeight = lineHeight
+  current.textStyle.lineHeight = if lineHeight != 0.0: lineHeight else: fontSize
   current.textStyle.textAlignHorizontal = textAlignHorizontal
   current.textStyle.textAlignVertical = textAlignVertical
 

From 89f7ace8e7f5e5f8400699dd9c45f03c1ea498ad Mon Sep 17 00:00:00 2001
From: Jaremy Creechley <creechley@gmail.com>
Date: Sun, 20 Feb 2022 02:00:54 -0800
Subject: [PATCH 6/7] put focus on selectable items when scrolling

---
 src/fidget/openglbackend.nim | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/fidget/openglbackend.nim b/src/fidget/openglbackend.nim
index e4c7c481..07518c6a 100644
--- a/src/fidget/openglbackend.nim
+++ b/src/fidget/openglbackend.nim
@@ -92,7 +92,9 @@ proc drawText(node: Node) =
 
   let mousePos = mouse.pos - node.screenBox.xy
 
-  if node.selectable and mouse.down and mouse.pos.overlaps(node.screenBox):
+  if node.selectable and mouse.wheelDelta != 0:
+    keyboard.focus(node)
+  elif node.selectable and mouse.down and mouse.pos.overlaps(node.screenBox):
     # mouse actions click, drag, double clicking
     keyboard.focus(node)
     if mouse.click:

From acf1548d921c1b558a09bf2e05a0379aa8d2b997 Mon Sep 17 00:00:00 2001
From: Jaremy Creechley <creechley@gmail.com>
Date: Sun, 20 Feb 2022 16:07:12 -0800
Subject: [PATCH 7/7] scale values

---
 examples/padoftext/padoftext.nim | 4 ++--
 src/fidget/opengl/base.nim       | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/examples/padoftext/padoftext.nim b/examples/padoftext/padoftext.nim
index 6179577e..9714769e 100644
--- a/examples/padoftext/padoftext.nim
+++ b/examples/padoftext/padoftext.nim
@@ -22,13 +22,13 @@ Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac tu
 proc drawMain() =
 
   group "pad":
-    box 100, 100, parent.box.w - 200, parent.box.h - 200
+    box 100, 100, parent.getScaled(box).w - 200, parent.getScaled(box).h - 200
     font "IBM Plex Sans Regular", 20.0, 400.0, 25, hLeft, vTop
     fill "#F7F7F9"
     clipContent true
 
     text "input":
-      box 0, 0, parent.box.w, parent.box.h
+      box 0, 0, parent.getScaled(box).w, parent.getScaled(box).h
       fill "#000000"
       multiline true
       binding textValue
diff --git a/src/fidget/opengl/base.nim b/src/fidget/opengl/base.nim
index a7615718..3ee4ee79 100644
--- a/src/fidget/opengl/base.nim
+++ b/src/fidget/opengl/base.nim
@@ -271,6 +271,7 @@ proc onSetKey(
 
 proc onScroll(window: staticglfw.Window, xoffset, yoffset: float64) {.cdecl.} =
   requestedFrame = true
+  let yoffset = yoffset * common.uiScale
   if keyboard.focusNode != nil:
     textBox.scrollBy(-yoffset * 1)
   else: