1.0.2 - Fix the button icon contrast, re-add picker button bg

Author: Lains

src/chooser.vala

@@ -31,6 +31,7 @@ public class Colorway.Chooser : Gtk.DrawingArea {
     public static unowned Chooser instance;
     private static Cairo.Surface surface;
     private static Gtk.GestureClick gesture;
+    private static Gtk.GestureDrag drag;
     public Gdk.RGBA active_color;
     public double h;
     public double s;
@@ -66,6 +67,11 @@ public class Colorway.Chooser : Gtk.DrawingArea {
         this.add_controller (gesture);
         GLib.Signal.connect (gesture, "released", (GLib.Callback) gesture_press_release, null);
 
+        drag = new Gtk.GestureDrag ();
+        GLib.Signal.connect (drag, "drag-begin", (GLib.Callback) gesture_drag_begin, null);
+        GLib.Signal.connect (drag, "drag-update", (GLib.Callback) gesture_drag_update, null);
+        this.add_controller (drag);
+
         surface = new Cairo.ImageSurface (Cairo.Format.ARGB32, WIDTH, HEIGHT);
 
         this.set_draw_func (draw_func);
@@ -155,4 +161,39 @@ public class Colorway.Chooser : Gtk.DrawingArea {
         instance.queue_draw ();
     }
 
+    private static void gesture_drag_begin (double start_x, double start_y) {
+        xpos = start_x;
+        ypos = start_y;
+
+        double new_s, new_v;
+        xy_to_sv (xpos, ypos, out new_s, out new_v);
+        instance.on_sv_move (new_s, new_v);
+        instance.queue_draw ();
+    }
+
+    private static void gesture_drag_update (double offset_x, double offset_y) {
+        double _xpos, _ypos;
+        drag.get_start_point (out _xpos, out _ypos);
+
+        if (_xpos + offset_x > WIDTH) {
+            xpos = WIDTH;
+        } else if (_xpos + offset_x < 0) {
+            xpos = 0;
+        } else {
+            xpos = _xpos + offset_x;
+        }
+
+        if (_ypos + offset_y > HEIGHT) {
+            ypos = HEIGHT;
+        } else if (_ypos + offset_y < 0) {
+            ypos = 0;
+        } else {
+            ypos = _ypos + offset_y;
+        }
+
+        double new_s, new_v;
+        xy_to_sv (xpos, ypos, out new_s, out new_v);
+        instance.on_sv_move (new_s, new_v);
+        instance.queue_draw ();
+    }
 }

src/window.vala

@@ -469,17 +469,58 @@ namespace Colorway {
             tbox.hex = rule_color2;
             ubox.hex = rule_color;
 
-            if (contrast == "#FFFFFF") {
-                box.light = false;
-                sbox.light = false;
-                tbox.light = false;
-                ubox.light = false;
-            } else {
+            Gdk.RGBA gcolor = {};
+            gcolor.parse(color);
+            Gdk.RGBA grcolor = {};
+            grcolor.parse(rule_color);
+            Gdk.RGBA grcolor1 = {};
+            grcolor1.parse(rule_color1);
+            Gdk.RGBA grcolor2 = {};
+            grcolor2.parse(rule_color2);
+
+            if (Utils.contrast_ratio(gcolor, {0,0,0,1}) > Utils.contrast_ratio(gcolor, {1,1,1,1}) + 3) {
                 box.light = true;
+            } else {
+                box.light = false;
+            }
+
+            if (Utils.contrast_ratio(grcolor1, {0,0,0,1}) > Utils.contrast_ratio(grcolor1, {1,1,1,1}) + 3) {
                 sbox.light = true;
+            } else {
+                sbox.light = false;
+            }
+
+            if (Utils.contrast_ratio(grcolor2, {0,0,0,1}) > Utils.contrast_ratio(grcolor2, {1,1,1,1}) + 3) {
                 tbox.light = true;
+            } else {
+                tbox.light = false;
+            }
+
+            if (Utils.contrast_ratio(grcolor, {0,0,0,1}) > Utils.contrast_ratio(grcolor, {1,1,1,1}) + 3) {
                 ubox.light = true;
+            } else {
+                ubox.light = false;
+            }
+
+            var css_provider = new Gtk.CssProvider();
+            string style = null;
+            style = """
+            .clr-preview {
+                background: %s;
+                color: %s;
+                border: 1px solid @borders;
+                border-radius: 9999px;
             }
+            """.printf(color,
+                       contrast);
+
+            css_provider.load_from_data(style.data);
+
+            Gtk.StyleContext.add_provider_for_display (
+                Gdk.Display.get_default (),
+                css_provider,
+                Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION
+            );
         }
 
         public void action_export () {