Linear and Radial Gradients on main branch

src/Drawables/Drawable.vala

@@ -43,8 +43,8 @@ public class Akira.Drawables.Drawable {
 
     // Style
     public double line_width { get; set; default = 0; }
-    public Gdk.RGBA fill_rgba { get; set; default = Gdk.RGBA (); }
-    public Gdk.RGBA stroke_rgba { get; set; default = Gdk.RGBA (); }
+    public Cairo.Pattern fill_pattern { get; set; default = new Cairo.Pattern.rgba (1, 1, 1, 1); }
+    public Cairo.Pattern border_pattern { get; set; default = new Cairo.Pattern.rgba (1, 1, 1, 1); }
     public BorderType border_type { get; set; default = BorderType.CENTER; }
     public double radius_tr { get; set; default = 0; }
     public double radius_tl { get; set; default = 0; }
@@ -383,7 +383,7 @@ public class Akira.Drawables.Drawable {
         if (draw_type == DrawType.XRAY) {
             return false;
         }
-        context.set_source_rgba (fill_rgba.red, fill_rgba.green, fill_rgba.blue, fill_rgba.alpha);
+        context.set_source (fill_pattern);
         context.set_antialias (Cairo.Antialias.GRAY);
         return true;
     }
@@ -396,7 +396,7 @@ public class Akira.Drawables.Drawable {
             return true;
         }
 
-        context.set_source_rgba (stroke_rgba.red, stroke_rgba.green, stroke_rgba.blue, stroke_rgba.alpha);
+        context.set_source (border_pattern);
         context.set_line_width (line_width);
         context.set_antialias (Cairo.Antialias.GRAY);
         return line_width > 0;

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,9 +39,10 @@ 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_pattern = pattern.copy ();
         var new_borders = node.instance.components.borders.copy ();
-        new_borders.replace (Lib.Components.Borders.Border (border_id, new_color));
+        var new_border = new_borders.border_from_id (border_id).with_replaced_pattern (new_pattern);
+        new_borders.replace (new_border);
         node.instance.components.borders = new_borders;
 
         im.item_model.alert_node_changed (node, Lib.Components.Component.Type.COMPILED_BORDER);
@@ -74,7 +75,12 @@ public class Akira.Layouts.BordersList.BorderItemModel : Models.ColorModel {
         (blocker);
 
         var border = _cached_instance.components.borders.border_from_id (border_id);
-        color = border.color;
+        active_pattern_type = border.active_pattern;
+
+        solid_pattern = border.solid_pattern;
+        linear_pattern = border.linear_pattern;
+        radial_pattern = border.radial_pattern;
+
         hidden = border.hidden;
     }
 }

src/Layouts/BordersList/BorderListItem.vala

@@ -50,7 +50,7 @@ public class Akira.Layouts.BordersList.BorderListItem : VirtualizingListBoxRow {
         context.add_class ("selected-color-container");
         context.add_class ("bg-pattern");
 
-        color_button = new Widgets.ColorButton ();
+        color_button = new Widgets.ColorButton (view_canvas.window);
         container.add (color_button);
 
         eyedropper_button = new Widgets.EyeDropperButton () {};

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;
 
@@ -39,9 +39,10 @@ public class Akira.Layouts.FillsList.FillItemModel : 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_pattern = pattern.copy ();
         var new_fills = node.instance.components.fills.copy ();
-        new_fills.replace (Lib.Components.Fills.Fill (fill_id, new_color));
+        var new_fill = new_fills.fill_from_id (fill_id).with_replaced_pattern (new_pattern);
+        new_fills.replace (new_fill);
         node.instance.components.fills = new_fills;
 
         im.item_model.alert_node_changed (node, Lib.Components.Component.Type.COMPILED_FILL);
@@ -74,7 +75,12 @@ public class Akira.Layouts.FillsList.FillItemModel : Models.ColorModel {
         (blocker);
 
         var fill = _cached_instance.components.fills.fill_from_id (fill_id);
-        color = fill.color;
+        active_pattern_type = fill.active_pattern;
+
+        solid_pattern = fill.solid_pattern;
+        linear_pattern = fill.linear_pattern;
+        radial_pattern = fill.radial_pattern;
+
         hidden = fill.hidden;
     }
 }

src/Layouts/FillsList/FillListItem.vala

@@ -50,7 +50,7 @@ public class Akira.Layouts.FillsList.FillListItem : VirtualizingListBoxRow {
         context.add_class ("selected-color-container");
         context.add_class ("bg-pattern");
 
-        color_button = new Widgets.ColorButton ();
+        color_button = new Widgets.ColorButton (view_canvas.window);
         container.add (color_button);
 
         eyedropper_button = new Widgets.EyeDropperButton () {};

src/Lib/Components/Borders.vala

@@ -22,25 +22,79 @@
 public class Akira.Lib.Components.Borders : Component, Copyable<Borders> {
     public struct Border {
         public int _id;
-        public Color _color;
+        public Pattern _pattern {
+            get {
+                switch (active_pattern) {
+                    case Pattern.PatternType.SOLID:
+                        return solid_pattern;
+                    case Pattern.PatternType.LINEAR:
+                        return linear_pattern;
+                    case Pattern.PatternType.RADIAL:
+                        return radial_pattern;
+                    default:
+                        return solid_pattern;
+                }
+            }
+
+            set {
+                switch (active_pattern) {
+                    case Pattern.PatternType.SOLID:
+                        solid_pattern = value;
+                        break;
+                    case Pattern.PatternType.LINEAR:
+                        linear_pattern = value;
+                        break;
+                    case Pattern.PatternType.RADIAL:
+                        radial_pattern = value;
+                        break;
+                    default:
+                        solid_pattern = value;
+                        break;
+                }
+            }
+        }
+
+        // Each border item will have patterns for all three types,
+        // so that user can easily switch between them.
+        // However, the non active patterns will not be serialized.
+        public Pattern solid_pattern;
+        public Pattern linear_pattern;
+        public Pattern radial_pattern;
+
+        public Pattern.PatternType active_pattern;
+
         public double _size;
 
-        public Border (int id = -1, Color color = Color (), double? size = null) {
+        public Border (int id = -1, Pattern pattern = new Pattern (), double? size = null) {
             _id = id;
-            _color = color;
+            active_pattern = Pattern.PatternType.SOLID;
+
+            var border_rgba = Gdk.RGBA ();
+            border_rgba.parse (settings.border_color);
+            solid_pattern = new Pattern.solid (border_rgba, false);
+
+            linear_pattern = new Pattern.linear (Geometry.Point (5, 5), Geometry.Point (95, 95), false);
+            radial_pattern = new Pattern.radial (Geometry.Point (5, 5), Geometry.Point (95, 95), false);
+
             _size = size != null ? size : settings.border_size;
         }
 
         public Border.deserialized (int id, Json.Object obj) {
             _id = id;
-            _color = Color.deserialized (obj.get_object_member ("color"));
             _size = (double)obj.get_int_member ("size");
         }
 
+        public Border.with_all_patterns (int id, Pattern solid_pattern, Pattern linear_pattern, Pattern radial_pattern, Pattern.PatternType type) {
+            this.solid_pattern = solid_pattern;
+            this.linear_pattern = linear_pattern;
+            this.radial_pattern = radial_pattern;
+            this.active_pattern = type;
+        }
+
         public Json.Node serialize () {
             var obj = new Json.Object ();
             obj.set_int_member ("id", _id);
-            obj.set_member ("color", _color.serialize ());
+            obj.set_member ("pattern", _pattern.serialize ());
             obj.set_double_member ("size", _size);
             var node = new Json.Node (Json.NodeType.OBJECT);
             node.set_object (obj);
@@ -53,14 +107,14 @@ public class Akira.Lib.Components.Borders : Component, Copyable<Borders> {
                 return _id;
             }
         }
-        public Gdk.RGBA color {
+        public Pattern pattern {
             get {
-                return _color.rgba;
+                return _pattern;
             }
         }
         public bool hidden {
             get {
-                return _color.hidden;
+                return _pattern.hidden;
             }
         }
         public double size {
@@ -71,11 +125,20 @@ public class Akira.Lib.Components.Borders : Component, Copyable<Borders> {
 
         // Mutators.
         public Border with_color (Color new_color) {
-            return Border (_id, new_color, _size);
+            Pattern pattern = new Pattern.solid (new_color.rgba, new_color.hidden);
+            var border = Border (id, pattern, _size);
+            return border;
+        }
+
+        public Border with_replaced_pattern (Pattern new_pattern) {
+            var new_border = Border.with_all_patterns (_id, solid_pattern, linear_pattern, radial_pattern, new_pattern.type);
+            new_border._pattern = new_pattern;
+
+            return new_border;
         }
 
         public Border with_size (double new_size) {
-            return Border (_id, _color, new_size);
+            return Border (_id, _pattern, new_size);
         }
     }
 
@@ -87,7 +150,7 @@ public class Akira.Lib.Components.Borders : Component, Copyable<Borders> {
 
     public Borders.single_color (Color color, int size) {
         data = new Border[1];
-        data[0] = Border (0, color, size);
+        data[0] = Border (0, new Pattern.solid (color.rgba, color.hidden), size);
     }
 
     public Borders.deserialized (Json.Object obj) {
@@ -124,7 +187,7 @@ public class Akira.Lib.Components.Borders : Component, Copyable<Borders> {
     public Border? border_from_id (int id) {
         foreach (unowned var border in data) {
             if (border.id == id) {
-                return border.with_color (border._color);
+                return Border.with_all_patterns (id, border.solid_pattern, border.linear_pattern, border.radial_pattern, border.active_pattern);
             }
         }
         return null;
@@ -150,7 +213,10 @@ public class Akira.Lib.Components.Borders : Component, Copyable<Borders> {
             latest_id = int.max (latest_id, border.id);
         }
         latest_id++;
-        var border = Border ((int) latest_id, color, size);
+
+        var pattern = new Pattern.solid (color.rgba, color.hidden);
+        var border = Border ((int) latest_id, pattern);
+
         data.resize (data.length + 1);
         data[data.length - 1] = border;
     }

src/Lib/Components/CompiledBorder.vala

@@ -20,12 +20,12 @@
  */
 
 public class Akira.Lib.Components.CompiledBorder : Copyable<CompiledBorder> {
-    private Gdk.RGBA _color;
+    private Pattern _pattern;
     private double _size;
     private bool _visible;
 
-    public Gdk.RGBA color {
-        get { return _color; }
+    public Pattern pattern {
+        get { return _pattern; }
     }
 
     public double size {
@@ -36,60 +36,64 @@ public class Akira.Lib.Components.CompiledBorder : Copyable<CompiledBorder> {
         get { return _visible; }
     }
 
-    public CompiledBorder (Gdk.RGBA color, double size, bool visible) {
-        _color = color;
+    public CompiledBorder (Pattern pattern, double size, bool visible) {
+        _pattern = pattern;
         _size = size;
         _visible = visible;
     }
 
     public CompiledBorder.as_empty () {
-        _color = Gdk.RGBA () { red = 0.0, green = 0.0, blue = 0.0, alpha = 0.0};
+        _pattern = new Pattern.solid (Gdk.RGBA () {red = 0, green = 0, blue = 0, alpha = 0}, false);
         _size = 0;
         _visible = false;
     }
 
     public CompiledBorder copy () {
-        return new CompiledBorder (_color, _size, _visible);
+        return new CompiledBorder (_pattern, size, _visible);
     }
 
     public static CompiledBorder compile (Components? components, Lib.Items.ModelNode? node) {
-        var rgba_border = Gdk.RGBA ();
+        var pattern_border = new Pattern ();
         bool has_colors = false;
-        double size = 0;
+        double border_size = 0;
 
         if (components == null) {
-            return new CompiledBorder (rgba_border, size, has_colors);
+            return new CompiledBorder (pattern_border, border_size, has_colors);
         }
 
         unowned var borders = components.borders;
         unowned var opacity = components.opacity;
-
-        // Set an initial arbitrary color with full transparency.
-        rgba_border.alpha = 0;
+        unowned var size = components.size;
+        unowned var center = components.center;
 
         if (borders == null) {
-            return new CompiledBorder (rgba_border, size, false);
+            return new CompiledBorder (pattern_border, border_size, has_colors);
         }
 
-        // Loop through all the configured borders and reload the color.
+        // Loop through all the configured borders.
         for (var i = 0; i < borders.data.length; ++i) {
             // Skip if the border is hidden as we don't need to blend colors.
             if (borders.data[i].hidden) {
                 continue;
             }
 
             // Set the new blended color.
-            rgba_border = Utils.Color.blend_colors (rgba_border, borders.data[i].color);
-            size = double.max (size, borders.data[i].size);
+            //  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;
+
+            // TODO: Temporarily disable blending patterns. Not implemented.
+            break;
         }
 
         // Apply the mixed RGBA value only if we had one.
         if (has_colors && opacity != null) {
-            // Keep in consideration the global opacity to properly update the border color.
-            rgba_border.alpha = rgba_border.alpha * opacity.opacity / 100;
+            // Keep in consideration the global opacity to properly update the fill color.
+            // TODO: Disable this too.
+            //  rgba_border.alpha = rgba_border.alpha * opacity.opacity / 100;
         }
 
-        return new CompiledBorder (rgba_border, size, has_colors && size != 0);
+        return new CompiledBorder (pattern_border, border_size, has_colors);
     }
 }