Towards packing CairoWidgets on ArdourCanvas.

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

diff --git a/libs/gtkmm2ext/ardour_icon.cc b/libs/gtkmm2ext/ardour_icon.cc
index fce6ab6db0c666f7bcf9e8cfe5ba2da36c8da521..5e89e3bd6f43f05da3e82870c324ca3feaf1ad08 100644 (file)
--- a/libs/gtkmm2ext/ardour_icon.cc
+++ b/libs/gtkmm2ext/ardour_icon.cc
@@ -640,8 +640,8 @@ static void icon_transport_play (cairo_t *cr, const int width, const int height)
 /** Midi Panic "!" */
 static void icon_transport_panic (cairo_t *cr, const int width, const int height)
 {
-       const int wh = std::min (width, height) * .1;
-       const double xc = width * .5;
+       const int wh = ceil (std::min (width, height) * .1) - .5;
+       const double xc = rint (width * .5);
        const double yh = height;
        cairo_rectangle (cr,
                         xc - wh, yh *.19,
@@ -730,8 +730,8 @@ static void icon_transport_metronom (cairo_t *cr, const int width, const int hei
 {
        const double x  = width * .5;
        const double y  = height * .5;
-       const double wh = std::min (x, y);
-       const double h  = wh * .85;
+       const double wh = .95 * std::min (x, y);
+       const double h  = wh * .80;
        const double w  = wh * .55;
        const double lw = w  * .34;
 
@@ -912,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);