diff --git a/src/widgets/draw_area.py b/src/widgets/draw_area.py index 110d3fb..6816828 100644 --- a/src/widgets/draw_area.py +++ b/src/widgets/draw_area.py @@ -38,6 +38,8 @@ class DrawArea(DrawAreaBase): self.set_size_request(800, 600) self.add_events( + Gdk.EventMask.ENTER_NOTIFY_MASK | + Gdk.EventMask.LEAVE_NOTIFY_MASK | Gdk.EventMask.KEY_PRESS_MASK | Gdk.EventMask.KEY_RELEASE_MASK | Gdk.EventMask.BUTTON_PRESS_MASK | @@ -46,6 +48,9 @@ class DrawArea(DrawAreaBase): Gdk.EventMask.POINTER_MOTION_MASK ) + self.connect("enter-notify-event", self._enter_notify_event) + self.connect("leave-notify-event", self._leave_notify_event) + self.connect("key-release-event", self._key_release_event) self.connect("button-press-event", self._button_press_event) self.connect("button-release-event", self._button_release_event) @@ -62,10 +67,21 @@ class DrawArea(DrawAreaBase): def _load_widgets(self): ... - def _button_press_event(self, widget, eve): + def _enter_notify_event(self, widget, eve): if not self.has_focus(): - self.grab_focus() + widget.grab_focus() + widget.get_window().set_cursor( + Gdk.Cursor.new_for_display( + Gdk.Display.get_default(), + Gdk.CursorType.BLANK_CURSOR + ) + ) + + def _leave_notify_event(self, widget, eve): + widget.get_window().set_cursor(None) + + def _button_press_event(self, widget, eve): if eve.type == Gdk.EventType.BUTTON_PRESS and eve.button == MouseButton.LEFT_BUTTON: self.event_collection.clear() @@ -112,7 +128,13 @@ class DrawArea(DrawAreaBase): self.queue_draw() def _motion_notify_event(self, area, eve): - if not self.is_drawing: return + if not self.is_drawing: + self.brush_point.points.clear() + self.brush_point.update(eve) + self.brush_point_surface.update(self.brush_point) + self.queue_draw() + return + self.brush.update(eve) self.queue_draw() @@ -124,10 +146,12 @@ class DrawArea(DrawAreaBase): self._is_not_drawing_draw_background(area, brush) self._is_not_drawing_draw_surfaces(area, brush) self.is_not_drawing_draw_overlay(area, brush) + self._is_drawing_brush_point(area, brush) case True: self._is_drawing_draw_background(area, brush) self._is_drawing_draw_surfaces(area, brush) self._is_drawing_draw_overlay(area, brush) + self._is_not_drawing_brush_point(area, brush) case _: ... @@ -167,3 +191,13 @@ class DrawArea(DrawAreaBase): brush.set_source_surface(self.intermediate_surface.area, 0.0, 0.0) self.intermediate_surface.draw() brush.paint() + + def _is_not_drawing_brush_point(self, area, brush: cairo.Context): + self.brush_point_surface.clear_surface() + + def _is_drawing_brush_point(self, area, brush: cairo.Context): + brush.set_source_surface(self.brush_point_surface.area, 0.0, 0.0) + self.brush_point_surface.draw() + brush.paint() + + self.brush_point_surface.history_manager.clear() diff --git a/src/widgets/draw_area_base.py b/src/widgets/draw_area_base.py index d01cfa9..7d478ec 100644 --- a/src/widgets/draw_area_base.py +++ b/src/widgets/draw_area_base.py @@ -26,6 +26,7 @@ class DrawAreaBase(Gtk.DrawingArea): self.background_surface: Surface = None self.active_surface: Surface = None self.intermediate_surface: Surface = None + self.brush_point_surface: Surface = None self.surface_manager: SurfaceManager = SurfaceManager() self.event_collection: EventCollection = EventCollection() @@ -36,6 +37,10 @@ class DrawAreaBase(Gtk.DrawingArea): self.brush_color = self.brush.color self.brush_size = self.brush.size + # Muast be a circle b/c it only needs one Point to be valid for draw + self.brush_point: BrushBase = getattr(brushes, "Circle")() + + def _setup_styling(self): margin_px = 24 @@ -54,6 +59,7 @@ class DrawAreaBase(Gtk.DrawingArea): self.background_surface = Surface(size_w, size_h) self.active_surface = Surface(size_w, size_h) self.intermediate_surface = Surface(size_w, size_h) + self.brush_point_surface = Surface(size_w, size_h) if image_surface: self.active_surface.create_new_area(image_surface) @@ -66,6 +72,7 @@ class DrawAreaBase(Gtk.DrawingArea): self.set_size_request(size_w, size_h) self.background_surface.update(self.grid_brush) self.surface_manager.append( self.active_surface ) + self.brush_point_surface.update(self.brush_point) def _save_image(self, fpath: str): self.active_surface.area.write_to_png(fpath) @@ -80,14 +87,23 @@ class DrawAreaBase(Gtk.DrawingArea): self.brush_color = [color.red, color.green, color.blue, color.alpha] self.brush.color = self.brush_color + self.brush_point = getattr(brushes, "Circle")() + self.brush_point.color = self.brush_color + def _set_brush_size(self, size: int): - self.brush_size = size self.brush = getattr(brushes, self.brush_mode)() + self.brush_size = size self.brush.size = self.brush_size + self.brush_point = getattr(brushes, "Circle")() + self.brush_point.size = self.brush_size + def _set_brush_mode(self, mode: str): - self.brush_mode = mode self.brush = getattr(brushes, self.brush_mode)() + self.brush_mode = mode self.brush.color = self.brush_color self.brush.size = self.brush_size + self.brush_point = getattr(brushes, "Circle")() + self.brush_point.color = self.brush_color + self.brush_point.size = self.brush_size diff --git a/src/widgets/image_type_dialog.py b/src/widgets/image_type_dialog.py index 6e85131..9b138fc 100644 --- a/src/widgets/image_type_dialog.py +++ b/src/widgets/image_type_dialog.py @@ -136,5 +136,3 @@ class ImageTypeDialog(Gtk.Dialog): height, cairo_stride ) - - return surface