Hi AND low pass filter -- fresh from the oven werks.

[ardour.git] / libs / gtkmm2ext / ardour_icon.cc

diff --git a/libs/gtkmm2ext/ardour_icon.cc b/libs/gtkmm2ext/ardour_icon.cc
index 8508cf3461869607301fd6e6d8a4650396c1568e..6a7cabe82934e1665fed1d8c2dd2cf8ad4706f66 100644 (file)
--- a/libs/gtkmm2ext/ardour_icon.cc
+++ b/libs/gtkmm2ext/ardour_icon.cc
@@ -522,10 +522,15 @@ static void icon_rec_enable (cairo_t *cr, const int width, const int height, con
        const double y = height * .5;
        const double r = std::min (x, y) * .55;
        cairo_arc (cr, x, y, r, 0, 2 * M_PI);
-       if (state == Gtkmm2ext::ExplicitActive)
-               cairo_set_source_rgba (cr, 0.95, 0.10, 0.10, 1.0);
-       else
-               cairo_set_source_rgba (cr, 0.95, 0.44, 0.44, 1.0); // #f46f6f
+       if (state == Gtkmm2ext::ExplicitActive) {
+               cairo_set_source_rgba (cr, 1.0, .1, .1, 1.0);
+       }
+       else if (state == Gtkmm2ext::ImplicitActive) {
+               cairo_set_source_rgba (cr, .9, .3, .3, 1.0);
+       }
+       else {
+               cairo_set_source_rgba (cr, .4, .3, .3, 1.0);
+       }
        cairo_fill_preserve (cr);
        cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.8); // outline
        cairo_set_line_width (cr, 1);
@@ -543,9 +548,13 @@ static void icon_rec_tape (cairo_t *cr, const int width, const int height, const
 
        cairo_arc (cr, 0, 0, r, 0, 2 * M_PI);
        if (state == Gtkmm2ext::ExplicitActive) {
-               cairo_set_source_rgba (cr, .95, .1, .1, 1.);
-       } else {
-               cairo_set_source_rgba (cr, .95, .44, .44, 1.); // #f46f6f
+               cairo_set_source_rgba (cr, 1.0, .1, .1, 1.0);
+       }
+       else if (state == Gtkmm2ext::ImplicitActive) {
+               cairo_set_source_rgba (cr, .9, .3, .3, 1.0);
+       }
+       else {
+               cairo_set_source_rgba (cr, .4, .3, .3, 1.0);
        }
        cairo_fill_preserve (cr);
        cairo_set_source_rgba (cr, .0, .0, .0, .5);
@@ -580,10 +589,15 @@ static void icon_rec_tape (cairo_t *cr, const int width, const int height, const
        cairo_restore (cr);
 
        cairo_arc (cr, 0, 0, r * .3, 0, 2 * M_PI);
-       if (state == Gtkmm2ext::ExplicitActive)
-               cairo_set_source_rgba (cr, .95, .1, .1, 1.);
-       else
-               cairo_set_source_rgba (cr, .95, .44, .44, 1.); // #f46f6f
+       if (state == Gtkmm2ext::ExplicitActive) {
+               cairo_set_source_rgba (cr, 1.0, .1, .1, 1.0);
+       }
+       else if (state == Gtkmm2ext::ImplicitActive) {
+               cairo_set_source_rgba (cr, .9, .3, .3, 1.0);
+       }
+       else {
+               cairo_set_source_rgba (cr, .4, .3, .3, 1.0);
+       }
        cairo_fill (cr);
        cairo_set_source_rgba (cr, .0, .0, .0, 1.0);
        cairo_arc (cr, 0, 0, r *.15, 0, 2 * M_PI); // hole in the middle
@@ -849,7 +863,7 @@ static void icon_close_cross (cairo_t *cr, const int width, const int height, co
        const double y = height * .5;
        const double o = .5 + std::min (x, y) * .4;
        ardour_icon_set_source_rgba (cr, fg_color);
-       cairo_set_line_width (cr, 2.0);
+       cairo_set_line_width (cr, 1.0);
        cairo_move_to (cr, x-o, y-o);
        cairo_line_to (cr, x+o, y+o);
        cairo_move_to (cr, x+o, y-o);
@@ -898,15 +912,15 @@ static void icon_strip_width (cairo_t *cr, const int width, const int height, co
        const double x1 = width   * .8;
 
        const double y0 = height  * .25;
-       const double y1= height   * .75;
+       const double y1 = height  * .75;
 
-       const double ym= height   * .5;
+       const double ym = height  * .5;
 
        // arrow
-       const double xa0= height  * .39;
-       const double xa1= height  * .61;
-       const double ya0= height  * .35;
-       const double ya1= height  * .65;
+       const double xa0= width  * .39;
+       const double xa1= width  * .61;
+       const double ya0= height * .35;
+       const double ya1= height * .65;
 
        ardour_icon_set_source_rgba (cr, fg_color);
        cairo_set_line_width (cr, 1);