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

Return to previous tool after using Magnifier or Pick Color tool

Browse Source
This commit is contained in:
Isaiah Odhner 2023-04-23 19:48:36 -04:00
parent 70cb60218f
commit 8136383bca
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
paint.py
View File

@ -1114,6 +1114,7 @@ class PaintApp(App[None]):
show_tools_box = var(True) show_tools_box = var(True)
show_colors_box = var(True) show_colors_box = var(True)
selected_tool = var(Tool.pencil) selected_tool = var(Tool.pencil)
return_to_tool = var(Tool.pencil)
selected_bg_color = var(palette[0]) selected_bg_color = var(palette[0])
selected_fg_color = var(palette[len(palette) // 2]) selected_fg_color = var(palette[len(palette) // 2])
selected_char = var(" ") selected_char = var(" ")
@ -1882,6 +1883,7 @@ class PaintApp(App[None]):
if self.selected_tool == Tool.magnifier: if self.selected_tool == Tool.magnifier:
self.magnifier_click(event.mouse_down_event.x, event.mouse_down_event.y) self.magnifier_click(event.mouse_down_event.x, event.mouse_down_event.y)
self.selected_tool = self.return_to_tool
return return
# TODO: use Offset() instead of tuple # TODO: use Offset() instead of tuple
@ -2324,7 +2326,8 @@ class PaintApp(App[None]):
self.make_preview(self.draw_current_polyline) # polyline until finished self.make_preview(self.draw_current_polyline) # polyline until finished
self.polygon_last_click_time = event.time self.polygon_last_click_time = event.time
elif self.selected_tool == Tool.pick_color:
self.selected_tool = self.return_to_tool
# Not reliably unset, so might as well not rely on it. (See early returns above.) # Not reliably unset, so might as well not rely on it. (See early returns above.)
@ -2390,6 +2393,8 @@ class PaintApp(App[None]):
def on_tools_box_tool_selected(self, event: ToolsBox.ToolSelected) -> None: def on_tools_box_tool_selected(self, event: ToolsBox.ToolSelected) -> None:
"""Called when a tool is selected in the palette.""" """Called when a tool is selected in the palette."""
self.selected_tool = event.tool self.selected_tool = event.tool
if self.selected_tool not in [Tool.magnifier, Tool.pick_color]:
self.return_to_tool = self.selected_tool
self.meld_selection() self.meld_selection()
self.tool_points = [] self.tool_points = []