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

DRY meld_selection + action_clear_selection

Browse Source
This commit is contained in:
Isaiah Odhner 2023-04-25 15:53:40 -04:00
parent b793a31108
commit 522004638e
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
paint.py
View File

@ -2239,28 +2239,27 @@ class PaintApp(App[None]):
# Clamp to the document bounds. # Clamp to the document bounds.
return region.intersection(Region(0, 0, self.image.width, self.image.height)) return region.intersection(Region(0, 0, self.image.width, self.image.height))
def meld_selection(self) -> None: def meld_or_clear_selection(self, meld: bool) -> None:
"""Draw the selection onto the image and dissolve the selection."""
# I could DRY this by making clear_selection return the Selection
if self.image.selection: if self.image.selection:
region = self.image.selection.region region = self.image.selection.region
self.image.selection.copy_to_document(self.image) if meld:
self.image.selection.copy_to_document(self.image)
else:
if not self.image.selection.contained_image:
# It hasn't been cut out yet, so we need to erase it.
self.erase_region(region, self.image.selection.mask)
self.image.selection = None self.image.selection = None
self.canvas.refresh_scaled_region(region) self.canvas.refresh_scaled_region(region)
self.selection_drag_offset = None self.selection_drag_offset = None
self.selecting_text = False self.selecting_text = False
def meld_selection(self) -> None:
"""Draw the selection onto the image and dissolve the selection."""
self.meld_or_clear_selection(meld=True)
def action_clear_selection(self) -> None: def action_clear_selection(self) -> None:
"""Delete the selection and its contents.""" """Delete the selection and its contents."""
if self.image.selection: self.meld_or_clear_selection(meld=False)
region = self.image.selection.region
if not self.image.selection.contained_image:
# It hasn't been cut out yet, so we need to erase it.
self.erase_region(region, self.image.selection.mask)
self.image.selection = None
self.canvas.refresh_scaled_region(region)
self.selection_drag_offset = None
self.selecting_text = False
def on_canvas_tool_update(self, event: Canvas.ToolUpdate) -> None: def on_canvas_tool_update(self, event: Canvas.ToolUpdate) -> None:
"""Called when the user is drawing on the canvas. """Called when the user is drawing on the canvas.