Circle checkbox was not drawn correctly.

MoonGameLab · Dec 17, 2023 · eda96f5 · eda96f5
1 parent b1a1f23
commit eda96f5
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 747 deletions.
diff --git a/Controls/CheckBox.moon b/Controls/CheckBox.moon
@@ -17,14 +17,15 @@ drawRect = =>
   r, g, b, a = Graphics.getColor!
   boxW, boxH = box\getWidth!, box\getHeight!
 
-  colorBk = @backColor
+  colorBk = @strokeColor
   local colorfr
 
   if @checked
     colorfr = @pressedColor
   else
     colorfr = @frontColor
 
+  Graphics.setLineStyle @borderLineStyle
   Graphics.setColor colorBk
   Graphics.rectangle "fill", box.x, box.y, boxW, boxH, @rx, @ry
   Graphics.setColor colorfr
@@ -51,25 +52,30 @@ drawCircle = =>
   r, g, b, a = Graphics.getColor!
   boxR = box\getRadius!
 
-  colorBk = @backColor
+  Graphics.setLineStyle @borderLineStyle
+
+  colorBk = @strokeColor
   local colorfr
 
   if @checked
     colorfr = @pressedColor
   else
     colorfr = @frontColor
 
-  Graphics.setColor colorBk
-  Graphics.circle 'fill', box.x, box.y, boxR, @segments
   Graphics.setColor colorfr
-  Graphics.circle 'fill', box.x, box.y, ceil(boxR - @margin), @segments
+  Graphics.circle 'fill', box.x, box.y, boxR
+
+  Graphics.setLineWidth @stroke
+  Graphics.setColor colorBk
+  Graphics.circle 'line', box.x, box.y, boxR
+
   Graphics.setColor r, g, b, a
 
 -- @local
 polyBorder = (box) =>
   oldLineWidth = Graphics.getLineWidth!
   Graphics.setLineWidth @stroke
-  Graphics.setLineStyle "rough"
+  Graphics.setLineStyle @borderLineStyle
   Graphics.setColor @strokeColor
   Graphics.polygon "line", box\getVertices!
   Graphics.setLineWidth oldLineWidth
@@ -113,9 +119,10 @@ class CheckBox extends Control
 
     @backColor = colors.downColor
     @frontColor = colors.upColor
-    @pressedColor = colors.strokeColor
+    @pressedColor = t.checkBox.pressedColor
     @disabledColor = colors.disabledColor
-    @strokeColor = {0, 0, 0}
+    @strokeColor = t.checkBox.borderLineColor
+    @borderLineStyle = t.checkBox.borderLineStyle
     @alpha = 1
     @reverseGroup = false
     @checked = false

diff --git a/Controls/assets/Iosevka-Bold.ttc b/Controls/assets/Iosevka-Bold.ttc
diff --git a/Controls/assets/SAIBA-45-Outline.ttf b/Controls/assets/SAIBA-45-Outline.ttf
diff --git a/Controls/assets/SAIBA-45.ttf b/Controls/assets/SAIBA-45.ttf
diff --git a/Controls/assets/fonts/saiba/Fonts/SAIBA-45-Outline.eot b/Controls/assets/fonts/saiba/Fonts/SAIBA-45-Outline.eot
diff --git a/Controls/assets/fonts/saiba/Fonts/SAIBA-45-Outline.otf b/Controls/assets/fonts/saiba/Fonts/SAIBA-45-Outline.otf
diff --git a/Controls/assets/fonts/saiba/Fonts/SAIBA-45-Outline.ttf b/Controls/assets/fonts/saiba/Fonts/SAIBA-45-Outline.ttf
diff --git a/Controls/assets/fonts/saiba/Fonts/SAIBA-45-Outline.woff b/Controls/assets/fonts/saiba/Fonts/SAIBA-45-Outline.woff
diff --git a/Controls/assets/fonts/saiba/Fonts/SAIBA-45.eot b/Controls/assets/fonts/saiba/Fonts/SAIBA-45.eot
diff --git a/Controls/assets/fonts/saiba/Fonts/SAIBA-45.otf b/Controls/assets/fonts/saiba/Fonts/SAIBA-45.otf
diff --git a/Controls/assets/fonts/saiba/Fonts/SAIBA-45.ttf b/Controls/assets/fonts/saiba/Fonts/SAIBA-45.ttf
diff --git a/Controls/assets/fonts/saiba/Fonts/SAIBA-45.woff b/Controls/assets/fonts/saiba/Fonts/SAIBA-45.woff
diff --git a/Controls/assets/fonts/saiba/LICENSE b/Controls/assets/fonts/saiba/LICENSE
diff --git a/Controls/assets/fonts/saiba/README.md b/Controls/assets/fonts/saiba/README.md
diff --git a/Controls/themes/blues.moon b/Controls/themes/blues.moon
@@ -39,10 +39,13 @@ Default =
       height: 25
       rx: 2
       ry: 2
-      margin: 4
+      margin: 3
       radius: 20
       segments: 300
       stroke: 3
+      pressedColor: {0.741, 0.761, 0.831}
+      borderLineColor: {0.361, 0.365, 0.38}
+      borderLineStyle: "smooth"
 
 
     textField: