mirror of
https://github.com/lalbornoz/roar.git
synced 2024-11-12 18:46:38 +00:00
99369626c4
libroar/RoarCanvasWindow.py:applyTool(): delegate updating of brushPos to ToolText if current tool. libroar/RoarCanvasWindow.py:applyTool(): fix function result. libroar/RoarCanvasWindow.py:applyTool(): pass updated set of arguments to on{Keyboard,Mouse}Event(). libroar/RoarCanvasWindow.py:onKeyboardInput(): allow wrapping around canvas when receiving cursor key input. libroar/RoarCanvasWindow.py:onKeyboardInput(): supply keyCode or None to applyTool(). libroar/RoarCanvas{CommandsTools,Window}.py: supply keyCode or None to applyTool(). libtools/Tool{,Circle,Fill,Line,Object,Rect}.py:on{Keyboard,Mouse}Event(): update type signature. libtools/ToolText.py:onKeyboardEvent(): fully implement {arrow keys,backspace,enter}. libtools/ToolText.py:onKeyboardEvent(): update cursor when necessary. libtools/ToolText.py:onMouseEvent(): correctly set brushPos if mouseLeftDown or mouseRightDown. libtools/ToolText.py:__init__(): removed. assets/text/TODO: updated.
40 lines
1.8 KiB
Python
40 lines
1.8 KiB
Python
#!/usr/bin/env python3
|
|
#
|
|
# ToolCircle.py
|
|
# Copyright (c) 2018, 2019 Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>
|
|
#
|
|
|
|
from Tool import Tool
|
|
|
|
class ToolCircle(Tool):
|
|
name = "Circle"
|
|
|
|
#
|
|
# onMouseEvent(self, atPoint, brushColours, brushPos, brushSize, canvas, dispatchFn, eventDc, keyModifiers, mapPoint, mouseDragging, mouseLeftDown, mouseRightDown, viewRect)
|
|
def onMouseEvent(self, atPoint, brushColours, brushPos, brushSize, canvas, dispatchFn, eventDc, keyModifiers, mapPoint, mouseDragging, mouseLeftDown, mouseRightDown, viewRect):
|
|
brushColours, dirty = brushColours.copy(), False
|
|
if mouseLeftDown:
|
|
brushColours[1] = brushColours[0]
|
|
elif mouseRightDown:
|
|
brushColours[0] = brushColours[1]
|
|
else:
|
|
brushColours[1] = brushColours[0]
|
|
_brushSize = brushSize[0] * 2
|
|
originPoint, radius = (_brushSize / 2, _brushSize / 2), _brushSize
|
|
for brushY in range(-radius, radius + 1):
|
|
for brushX in range(-radius, radius + 1):
|
|
if ((brushX ** 2) + (brushY ** 2) < (((radius ** 2) + radius) * 0.8)):
|
|
patch = [ \
|
|
mapPoint[0] + int(originPoint[0] + brushX), \
|
|
mapPoint[1] + int(originPoint[1] + brushY), \
|
|
*brushColours, 0, " "]
|
|
if mouseLeftDown or mouseRightDown:
|
|
if not dirty:
|
|
dirty = True
|
|
dispatchFn(eventDc, False, patch, viewRect); dispatchFn(eventDc, True, patch, viewRect);
|
|
else:
|
|
dispatchFn(eventDc, True, patch, viewRect)
|
|
return True, dirty
|
|
|
|
# vim:expandtab foldmethod=marker sw=4 ts=4 tw=120
|