Prevent fill pattern from changing when border pattern modified.

src/Layouts/BordersList/BorderItemModel.vala

@@ -26,7 +26,7 @@
 public class Akira.Layouts.BordersList.BorderItemModel : Models.ColorModel {
     private unowned Lib.ViewCanvas _view_canvas;
 
-    private Lib.Items.ModelInstance _cached_instance;
+    //  private Lib.Items.ModelInstance _cached_instance;
 
     public int border_id;
 
@@ -39,12 +39,6 @@ public class Akira.Layouts.BordersList.BorderItemModel : Models.ColorModel {
         var node = im.item_model.node_from_id (_cached_instance.id);
         assert (node != null);
 
-        //  var new_color = Lib.Components.Color.from_rgba (color, hidden);
-        //  var new_borders = node.instance.components.borders.copy ();
-        //  new_borders.replace (Lib.Components.Borders.Border (border_id, new_color));
-        //  node.instance.components.borders = new_borders;
-
-        print("Pattern type %s\n", pattern.type.to_string ());
         var new_pattern = pattern.copy ();
         var new_borders = node.instance.components.borders.copy ();
         var new_border = new_borders.border_from_id (border_id).with_replaced_pattern (new_pattern);

src/Layouts/FillsList/FillItemModel.vala

@@ -26,7 +26,7 @@
 public class Akira.Layouts.FillsList.FillItemModel : Models.ColorModel {
     private unowned Akira.Lib.ViewCanvas _view_canvas;
 
-    private Lib.Items.ModelInstance _cached_instance;
+    //  private Lib.Items.ModelInstance _cached_instance;
 
     public int fill_id;
 
@@ -62,39 +62,6 @@ public class Akira.Layouts.FillsList.FillItemModel : Models.ColorModel {
         im.compile_model ();
     }
 
-    public void move_pattern_position_by_delta (Utils.Nobs.Nob nob, Geometry.Point delta) {
-        Geometry.Point percent_delta = Geometry.Point (
-            delta.x * 100.0 / _cached_instance.components.size.width,
-            delta.y * 100.0 / _cached_instance.components.size.height
-        );
-
-        switch (nob) {
-            case Utils.Nobs.Nob.GRADIENT_START:
-                pattern.start = Geometry.Point (
-                    pattern.start.x - percent_delta.x,
-                    pattern.start.y - percent_delta.y
-                );
-                break;
-            case Utils.Nobs.Nob.GRADIENT_END:
-                pattern.end = Geometry.Point (
-                    pattern.end.x - percent_delta.x,
-                    pattern.end.y - percent_delta.y
-                );
-                break;
-            case Utils.Nobs.Nob.GRADIENT_RADIUS_START:
-                pattern.radius_start = pattern.radius_start + percent_delta.x;
-                break;
-            case Utils.Nobs.Nob.GRADIENT_RADIUS_END:
-                pattern.radius_end = pattern.radius_end + percent_delta.x;
-                break;
-            default:
-                break;
-        }
-
-        on_value_changed ();
-        value_changed ();
-    }
-
     public FillItemModel (Lib.ViewCanvas view_canvas, Lib.Items.ModelNode node, int fill_id) {
         update_node (node, fill_id);
         _view_canvas = view_canvas;

src/Lib/Components/CompiledBorder.vala

@@ -79,6 +79,7 @@ public class Akira.Lib.Components.CompiledBorder : Copyable<CompiledBorder> {
 
             // Set the new blended color.
             //  rgba_border = Utils.Color.blend_colors (rgba_border, borders.data[i].pattern.get_first_color ());
+            border_size = borders.data[i].size;
             pattern_border = Utils.Pattern.create_pattern_with_converted_positions (borders.data[i].pattern, size, center);
             has_colors = true;
 

src/Models/ColorModel.vala

@@ -40,6 +40,7 @@ public class Akira.Models.ColorModel : GLib.Object {
     }
 
     protected int block_signal = 0;
+    protected Lib.Items.ModelInstance _cached_instance;
 
     // All three types of patterns will be stored here.
     // Based on which type is active, update it.
@@ -127,6 +128,39 @@ public class Akira.Models.ColorModel : GLib.Object {
         }
     }
 
+    public void move_pattern_position_by_delta (Utils.Nobs.Nob nob, Geometry.Point delta) {
+        Geometry.Point percent_delta = Geometry.Point (
+            delta.x * 100.0 / _cached_instance.components.size.width,
+            delta.y * 100.0 / _cached_instance.components.size.height
+        );
+
+        switch (nob) {
+            case Utils.Nobs.Nob.GRADIENT_START:
+                pattern.start = Geometry.Point (
+                    pattern.start.x - percent_delta.x,
+                    pattern.start.y - percent_delta.y
+                );
+                break;
+            case Utils.Nobs.Nob.GRADIENT_END:
+                pattern.end = Geometry.Point (
+                    pattern.end.x - percent_delta.x,
+                    pattern.end.y - percent_delta.y
+                );
+                break;
+            case Utils.Nobs.Nob.GRADIENT_RADIUS_START:
+                pattern.radius_start = pattern.radius_start + percent_delta.x;
+                break;
+            case Utils.Nobs.Nob.GRADIENT_RADIUS_END:
+                pattern.radius_end = pattern.radius_end + percent_delta.x;
+                break;
+            default:
+                break;
+        }
+
+        on_value_changed ();
+        value_changed ();
+    }
+
     public virtual void on_value_changed () {}
     public virtual void delete () {}
 }

src/Widgets/PatternTypeChooser.vala

@@ -41,25 +41,24 @@ public class Akira.Widgets.PatternTypeChooser : Granite.Widgets.ModeButton {
 
         // Connect signals.
         this.mode_changed.connect ((window) => {
-            print("Mode changed\n");
             var active_mode = (Lib.Components.Pattern.PatternType) this.selected;
-            print("Got active mode as %s\n", active_mode.to_string ());
-            print("Active pattern type is %s\n", model.active_pattern_type.to_string ());
 
             model.active_pattern_type = active_mode;
-            print("Change active mode to %s\n", active_mode.to_string ());
             pattern_changed (model.pattern);
-            print("Done signal\n");
-
+
             handle_pattern_changed ();
-            print("Handled signal\n");
         });
 
         this.canvas = window.main_window.main_view_canvas.canvas;
 
         window.event_bus.translate_gradient_nob_by_delta.connect ((nob, delta) => {
-            ((Layouts.FillsList.FillItemModel) model).move_pattern_position_by_delta (nob, delta);
+            // This condition checks if this widget is currently open as there can be multiple instances
+            // if PatternTypeChooser present. And we don't want all of them to handle this signal.
+            if (!is_drawable ()) {
+                return;
+            }
 
+            model.move_pattern_position_by_delta (nob, delta);
             handle_pattern_changed ();
         });
     }