Fixes to Canvas renderer.

Disks/PixelVisionOS/System/Libs/pixel-vision-os-file-modal-v1.lua

@@ -62,12 +62,12 @@ function NewFileModal:Open()
   -- Draw the black background
   self.canvas:SetStroke(0, 1)
   self.canvas:SetPattern({0}, 1, 1)
-  self.canvas:DrawSquare(0, 0, self.canvas.width - 1, self.canvas.height - 1, true)
+  self.canvas:DrawRectangle(0, 0, self.canvas.width - 1, self.canvas.height - 1, true)
 
   -- Draw the brown background
   self.canvas:SetStroke(12, 1)
   self.canvas:SetPattern({11}, 1, 1)
-  self.canvas:DrawSquare(2, 8, self.canvas.width - 3, self.canvas.height - 3, true)
+  self.canvas:DrawRectangle(2, 8, self.canvas.width - 3, self.canvas.height - 3, true)
 
   local tmpX = (self.canvas.width - (#self.title * 4)) * .5
 

Disks/PixelVisionOS/System/Libs/pixel-vision-os-message-modal-v3.lua

@@ -57,12 +57,12 @@ function MessageModal:Open()
     -- Draw the black background
     self.canvas:SetStroke(5, 1)
     self.canvas:SetPattern({0}, 1, 1)
-    self.canvas:DrawSquare(0, 0, self.canvas.width - 1, self.canvas.height - 1, true)
+    self.canvas:DrawRectangle(0, 0, self.canvas.width, self.canvas.height, true)
 
     -- Draw the brown background
     self.canvas:SetStroke(12, 1)
     self.canvas:SetPattern({11}, 1, 1)
-    self.canvas:DrawSquare(3, 9, self.canvas.width - 4, self.canvas.height - 4, true)
+    self.canvas:DrawRectangle(3, 9, self.canvas.width - 6, self.canvas.height - 12, true)
 
     local tmpX = (self.canvas.width - (#self.title * 4)) * .5
 

Disks/PixelVisionOS/System/Libs/pixel-vision-os-title-bar-v2.lua

@@ -199,11 +199,11 @@ function PixelVisionOS:CreateTitleBarMenu(items, toolTip)
     -- Create a solid background pattern
     canvas:SetPattern({12}, 1, 1)
 
-    -- Draw border
-    canvas:DrawSquare(0, 0, canvas.width - 8, canvas.height - 8, true)
+    -- Draw background and border
+    canvas:DrawRectangle(0, 0, canvas.width - 8, canvas.height - 8, true)
     canvas.wrap = false
 
-    canvas:Draw()
+    --canvas:Draw()
 
     local tmpCanvas = NewCanvas(canvas.width - 12, itemHeight)
     tmpCanvas.wrap = false
@@ -226,6 +226,8 @@ function PixelVisionOS:CreateTitleBarMenu(items, toolTip)
         -- Draw the up state
         self:DrawTitleBarMenuItem(tmpCanvas, option, 14)
 
+        --print(option.name, tmpCanvas.width, tmpCanvas.height, #tmpCanvas:GetPixels())
+
         canvas:MergePixels(tmpX, tmpY, tmpCanvas.width, tmpCanvas.height, tmpCanvas:GetPixels(), false, false, 0, true)
 
         if(option.divider ~= true) then
@@ -313,8 +315,8 @@ function PixelVisionOS:DrawTitleBarMenuItem(canvas, option, bgColor2)
             local tmpX = canvas.width - 16
             local tmpY = 1
 
-            canvas:DrawSquare(tmpX, tmpY, tmpX + 12, tmpY + 7, true)
-
+            canvas:DrawRectangle(tmpX, tmpY, 12, 7, true)
+            
             canvas:DrawText(("^" .. tostring(option.key)):upper(), tmpX + 2, tmpY - 1, "small", t2Color, - 4)
 
         end

Disks/PixelVisionOS/System/Tools/DrawTool/code-color-editor-modal.lua

@@ -59,12 +59,12 @@ function EditColorModal:Configure()
     -- Draw the black background
     self.canvas:SetStroke(5, 1)
     self.canvas:SetPattern({0}, 1, 1)
-    self.canvas:DrawSquare(0, 0, self.canvas.width - 1, self.canvas.height - 1, true)
+    self.canvas:DrawRectangle(0, 0, self.canvas.width, self.canvas.height, true)
 
     -- Draw the brown background
     self.canvas:SetStroke(12, 1)
     self.canvas:SetPattern({11}, 1, 1)
-    self.canvas:DrawSquare(3, 9, self.canvas.width - 4, self.canvas.height - 4, true)
+    self.canvas:DrawRectangle(3, 9, self.canvas.width - 6, self.canvas.height - 12, true)
 
     local tmpX = (self.canvas.width - (#self.title * 4)) * .5
 

Disks/PixelVisionOS/System/Tools/DrawTool/code-fix-sprite-modal.lua

@@ -67,12 +67,12 @@ function FixSpriteModal:Open()
     -- Draw the black background
     self.canvas:SetStroke(5, 1)
     self.canvas:SetPattern({0}, 1, 1)
-    self.canvas:DrawSquare(0, 0, self.canvas.width - 1, self.canvas.height - 1, true)
+    self.canvas:DrawRectangle(0, 0, self.canvas.width, self.canvas.height, true)
 
     -- Draw the brown background
     self.canvas:SetStroke(12, 1)
     self.canvas:SetPattern({11}, 1, 1)
-    self.canvas:DrawSquare(3, 9, self.canvas.width - 4, self.canvas.height - 4, true)
+    self.canvas:DrawRectangle(3, 9, self.canvas.width - 6, self.canvas.height - 12, true)
 
     local tmpX = (self.canvas.width - (#self.title * 4)) * .5
 

Disks/PixelVisionOS/System/Tools/WorkspaceTool/code-icon-button.lua

@@ -152,7 +152,7 @@ function PixelVisionOS:CreateIconButtonStates(data, spriteName, text, bgColor)
                 end
 
                 -- Clear the area for the text
-                canvas:DrawSquare(0, 24, data.rect.w - 2, 24 + 14, true)
+                canvas:DrawRectangle(0, 24, data.rect.w - 2, 14, true)
 
                 for i = 1, #lines do
 
@@ -181,7 +181,7 @@ function PixelVisionOS:CreateIconButtonStates(data, spriteName, text, bgColor)
                         canvas:SetStroke(0, 1)
                         canvas:SetPattern({0}, 1, 1)
 
-                        canvas:DrawSquare(x - 1, y + 1, (x ) + (#line * 4) + 1, (y) + 9, true)
+                        canvas:DrawRectangle(x - 1, y + 1, (#line * 4) + 2,  8, true)
 
                     end
 

PixelVision8.CoreDesktop.csproj

@@ -42,6 +42,9 @@
     <Compile Include="SDK\**\*.cs">
       <Link>SDK\%(RecursiveDir)%(Filename)%(Extension)</Link>
     </Compile>
+    <Compile Update="SDK\Engine\Data\Canvas\Canvas.cs">
+      <Link>SDK\Engine\Data\Canvas.cs</Link>
+    </Compile>
   </ItemGroup>
 
   <ItemGroup>