1j01/textual-paint
1
1
Fork 0
mirror of https://github.com/1j01/textual-paint.git synced 2024-12-22 14:21:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix cells stroked outside the mouse's path

Browse Source 
Use absolute positions instead of delta coordinates.

The deltas would sometimes give points "jutting out" — only by a pixel,
but confusing when trying to do pixel art. You might not even notice it
but it might make you feel like a bad artist until you do.
This commit is contained in:
Isaiah Odhner 2023-04-24 01:40:20 -04:00
parent dc02833f3f
commit 0c42edce9c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
paint.py
View File

@ -944,8 +944,6 @@ class Canvas(Widget):
self.fix_mouse_event(event) self.fix_mouse_event(event)
event.x //= self.magnification event.x //= self.magnification
event.y //= self.magnification event.y //= self.magnification
event.delta_x //= self.magnification
event.delta_y //= self.magnification
if self.pointer_active: if self.pointer_active:
self.post_message(self.ToolUpdate(event)) self.post_message(self.ToolUpdate(event))
@ -1158,6 +1156,8 @@ class PaintApp(App[None]):
# (Line, Rectangle, Ellipse, Rounded Rectangle), # (Line, Rectangle, Ellipse, Rounded Rectangle),
# Select tool (similarly), and Polygon (to detect double-click) # Select tool (similarly), and Polygon (to detect double-click)
mouse_at_start = Offset(0, 0) mouse_at_start = Offset(0, 0)
# for brush tools (Pencil, Brush, Eraser, Airbrush)
mouse_previous = Offset(0, 0)
# for Select tool, indicates that the selection is being moved # for Select tool, indicates that the selection is being moved
# and defines the offset of the selection from the mouse # and defines the offset of the selection from the mouse
selection_drag_offset = Offset(0, 0) selection_drag_offset = Offset(0, 0)
@ -1912,6 +1912,7 @@ class PaintApp(App[None]):
return return
self.mouse_at_start = Offset(event.mouse_down_event.x, event.mouse_down_event.y) self.mouse_at_start = Offset(event.mouse_down_event.x, event.mouse_down_event.y)
self.mouse_previous = self.mouse_at_start
if self.selected_tool in [Tool.curve, Tool.polygon]: if self.selected_tool in [Tool.curve, Tool.polygon]:
self.tool_points.append(Offset(event.mouse_down_event.x, event.mouse_down_event.y)) self.tool_points.append(Offset(event.mouse_down_event.x, event.mouse_down_event.y))
@ -2213,7 +2214,7 @@ class PaintApp(App[None]):
self.undos.append(action) self.undos.append(action)
if self.selected_tool in [Tool.pencil, Tool.brush, Tool.eraser, Tool.airbrush]: if self.selected_tool in [Tool.pencil, Tool.brush, Tool.eraser, Tool.airbrush]:
for x, y in bresenham_walk(mm.x - mm.delta_x, mm.y - mm.delta_y, mm.x, mm.y): for x, y in bresenham_walk(self.mouse_previous.x, self.mouse_previous.y, mm.x, mm.y):
affected_region = self.stamp_brush(x, y, affected_region) affected_region = self.stamp_brush(x, y, affected_region)
elif self.selected_tool == Tool.line: elif self.selected_tool == Tool.line:
for x, y in bresenham_walk(self.mouse_at_start.x, self.mouse_at_start.y, mm.x, mm.y): for x, y in bresenham_walk(self.mouse_at_start.x, self.mouse_at_start.y, mm.x, mm.y):
@ -2272,6 +2273,8 @@ class PaintApp(App[None]):
affected_region = affected_region.union(old_action.region) affected_region = affected_region.union(old_action.region)
self.canvas.refresh_scaled_region(affected_region) self.canvas.refresh_scaled_region(affected_region)
self.mouse_previous = mm.offset
def on_canvas_tool_stop(self, event: Canvas.ToolStop) -> None: def on_canvas_tool_stop(self, event: Canvas.ToolStop) -> None:
"""Called when releasing the mouse button after drawing/dragging on the canvas.""" """Called when releasing the mouse button after drawing/dragging on the canvas."""
# Clear the selection preview in case the mouse has moved. # Clear the selection preview in case the mouse has moved.