Only use the repaint event in ActiveShape.

Author: ilopX

patterns/memento/memento_editor/editor/manipulator.dart

@@ -1,32 +1,19 @@
 import '../../../adapter/flutter_adapter/classic_app/classic_app.dart';
 import '../shapes/shapes.dart';
 
-mixin Manipulator implements ClassicApp, Shapes {
+mixin Manipulator implements Shapes {
   var _isMouseDown = false;
 
   @override
   void onMouseDown(double x, double y) {
     _isMouseDown = true;
-    final currSelection = activeShape;
-
     select(x, y);
-
-    if (currSelection == activeShape) {
-      return;
-    }
-
-    if (activeShape == null) {
-      unSelect();
-    }
-
-    repaint();
   }
 
   @override
   void onMouseMove(double x, double y) {
     if (_isMouseDown) {
       activeShape?.dragTo(x, y);
-      repaint();
     }
   }
 

patterns/memento/memento_editor/memento_pattern/originator.dart

@@ -2,12 +2,11 @@ import 'dart:convert';
 import 'dart:typed_data';
 import 'dart:ui';
 
-import '../../../adapter/flutter_adapter/classic_app/classic_app.dart';
 import '../shapes/shapes.dart';
 import '../shapes/shape.dart';
 import 'snapshot.dart';
 
-mixin Originator implements Shapes, ClassicApp {
+mixin Originator implements Shapes {
   Snapshot backup() {
     final data = _allocateBuffer();
     _writeShapes(data);

patterns/memento/memento_editor/shapes/active_shape.dart

@@ -4,7 +4,9 @@ class ActiveShape {
   final Shape shape;
   final void Function() repaint;
 
-  ActiveShape(this.shape, this._xStart, this._yStart, this.repaint);
+  ActiveShape(this.shape, this._xStart, this._yStart, this.repaint) {
+    repaint();
+  }
 
   void changeSize(double delta) {
     final currentSize = shape.size;
@@ -30,7 +32,6 @@ class ActiveShape {
   void dragTo(double x, double y) {
     shape._x = x + _xStart;
     shape._y = y + _yStart;
-
     repaint();
   }
 
@@ -53,4 +54,8 @@ class ActiveShape {
         ..color = Color(0xff26e6ff),
     );
   }
+
+  void dispose() {
+    repaint();
+  }
 }

patterns/memento/memento_editor/shapes/shapes.dart

@@ -15,7 +15,7 @@ mixin Shapes implements ClassicApp {
     if (shape != null) {
       _activeShape = ActiveShape(shape, shape.x - x, shape.y - y, repaint);
     } else {
-      _activeShape = null;
+      unSelect();
     }
   }
 
@@ -30,6 +30,11 @@ mixin Shapes implements ClassicApp {
   }
 
   void unSelect() {
+    if (_activeShape == null) {
+      return;
+    }
+
+    _activeShape?.dispose();
     _activeShape = null;
   }
 

patterns/memento/memento_editor/widgets/panels/shape_properties_widget.dart

@@ -53,7 +53,6 @@ class ShapePropertiesWidget extends StatelessWidget {
                   colors: colors,
                   onColorSelect: (newColor) {
                     app.editor.activeShape?.changeColor(newColor);
-
                   },
                 ),
               ],