Merge pull request #36 from HarryPeach/PS_29

Change cursor when not in canvas

Author: HarryPeach

sand_game/__main__.py

@@ -164,7 +164,8 @@ def open_filepicker(self, new: bool = False) -> str:
                                        defaultextension=".json",
                                        title="Export canvas")
         else:
-            result = askopenfilename(initialfile="import", title="Import canvas")
+            result = askopenfilename(
+                initialfile="import", title="Import canvas")
 
         return result
 
@@ -301,13 +302,15 @@ def draw(self) -> None:
                 particle = self.canvas_controller.get(x, y)
                 if particle is not None:
                     pyxel.pset(
-                        x + self.canvas_start_loc[0], y + self.canvas_start_loc[1],
+                        x + self.canvas_start_loc[0], y +
+                        self.canvas_start_loc[1],
                         particle.color
                     )
 
         self.gui.draw()
         self.gui.handle_hover(pyxel.mouse_x, pyxel.mouse_y)
-        draw_cursor(self.pen_size - 1, 7)
+        draw_cursor(self.pen_size - 1, 7, self.canvas_width,
+                    self.canvas_height, self.canvas_start_loc)
 
 
 if __name__ == "__main__":

sand_game/draw_utils.py

@@ -1,11 +1,24 @@
+from sand_game import canvas
 import pyxel
+from typing import Tuple
 
 
-def draw_cursor(width: int, color: int) -> None:
+def draw_cursor(width: int, color: int, canvas_width: int, canvas_height: int,
+                canvas_start_loc: Tuple[int, int]) -> None:
     """Draws the cursor
 
     Args:
         width (int): The width of the cursor
         color (int): The color to draw
+        canvas_width (int): The width of the canvas
+        canvas_height (int): The height of the canvas
+        canvas_start_loc (tuple[int, int]): The starting location of the canvas
     """
-    pyxel.circb(pyxel.mouse_x, pyxel.mouse_y, width, color)
+    if ((pyxel.mouse_x < canvas_start_loc[0] - 1 or
+            pyxel.mouse_x > canvas_start_loc[0] + canvas_width) or
+            (pyxel.mouse_y < canvas_start_loc[1] - 1 or
+                pyxel.mouse_y > canvas_start_loc[1] + canvas_height)):
+        pyxel.mouse(True)
+    else:
+        pyxel.mouse(False)
+        pyxel.circb(pyxel.mouse_x, pyxel.mouse_y, width, color)