mirror of
https://github.com/lalbornoz/roar.git
synced 2024-11-26 08:56:36 +00:00
f2a19e0bf3
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.
56 lines
2.7 KiB
Python
56 lines
2.7 KiB
Python
#!/usr/bin/env python3
|
|
#
|
|
# ToolText.py
|
|
# Copyright (c) 2018, 2019 Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>
|
|
#
|
|
|
|
from Tool import Tool
|
|
import string, wx
|
|
|
|
class ToolText(Tool):
|
|
name = "Text"
|
|
|
|
#
|
|
# onKeyboardEvent(self, atPoint, brushColours, brushPos, brushSize, canvas, dispatchFn, eventDc, keyChar, keyCode, keyModifiers, mapPoint, viewRect)
|
|
def onKeyboardEvent(self, atPoint, brushColours, brushPos, brushSize, canvas, dispatchFn, eventDc, keyChar, keyCode, keyModifiers, mapPoint, viewRect):
|
|
if keyCode == wx.WXK_BACK:
|
|
if brushPos[0] > 0:
|
|
brushPos[0] -= 1
|
|
elif brushPos[1] > 0:
|
|
brushPos[0], brushPos[1] = canvas.size[0] - 1, brushPos[1] - 1
|
|
else:
|
|
brushPos[0], brushPos[1] = canvas.size[0] - 1, canvas.size[1] - 1
|
|
rc, dirty = True, False; dispatchFn(eventDc, True, [*brushPos, *brushColours, 0, "_"], viewRect);
|
|
elif keyCode == wx.WXK_RETURN:
|
|
if brushPos[1] < (canvas.size[1] - 1):
|
|
brushPos[0], brushPos[1] = 0, brushPos[1] + 1
|
|
else:
|
|
brushPos[0], brushPos[1] = 0, 0
|
|
rc, dirty = True, False; dispatchFn(eventDc, True, [*brushPos, *brushColours, 0, "_"], viewRect);
|
|
elif (ord(keyChar) != wx.WXK_NONE) \
|
|
and (not keyChar in set("\t\n\v\f\r")) \
|
|
and ((ord(keyChar) >= 32) if ord(keyChar) < 127 else True) \
|
|
and (keyModifiers in (wx.MOD_NONE, wx.MOD_SHIFT)):
|
|
dispatchFn(eventDc, False, [*brushPos, *brushColours, 0, keyChar], viewRect);
|
|
if brushPos[0] < (canvas.size[0] - 1):
|
|
brushPos[0] += 1
|
|
elif brushPos[1] < (canvas.size[1] - 1):
|
|
brushPos[0], brushPos[1] = 0, brushPos[1] + 1
|
|
else:
|
|
brushPos[0], brushPos[1] = 0, 0
|
|
dispatchFn(eventDc, True, [*brushPos, *brushColours, 0, "_"], viewRect)
|
|
rc, dirty = True, True
|
|
else:
|
|
rc, dirty = False, False
|
|
return rc, dirty
|
|
|
|
#
|
|
# 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):
|
|
if mouseLeftDown or mouseRightDown:
|
|
brushPos[0], brushPos[1] = atPoint[0], atPoint[1]
|
|
dispatchFn(eventDc, True, [*brushPos, *brushColours, 0, "_"], viewRect)
|
|
return True, False
|
|
|
|
# vim:expandtab foldmethod=marker sw=4 ts=4 tw=120
|