Restore snap when switching to/from internal.

[ardour.git] / gtk2_ardour / panner2d.cc

diff --git a/gtk2_ardour/panner2d.cc b/gtk2_ardour/panner2d.cc
index abb47a98730a7f599b52e7726f10026d1aa862e0..8de18dd2c7d2a7436264019d48b1cb465ec33dfa 100644 (file)
--- a/gtk2_ardour/panner2d.cc
+++ b/gtk2_ardour/panner2d.cc
@@ -33,6 +33,9 @@
 #include "ardour/pannable.h"
 #include "ardour/speakers.h"
 
+#include "canvas/colors.h"
+
+#include "ardour_ui.h"
 #include "panner2d.h"
 #include "keyboard.h"
 #include "gui_thread.h"
@@ -415,7 +418,7 @@ Panner2d::on_expose_event (GdkEventExpose *event)
 {
        CartesianVector c;
        cairo_t* cr;
-       bool small = (height <= large_size_threshold);
+       bool xsmall = (height <= large_size_threshold);
        const double diameter = radius*2.0;
 
        cr = gdk_cairo_create (get_window()->gobj());
@@ -424,10 +427,9 @@ Panner2d::on_expose_event (GdkEventExpose *event)
 
        cairo_rectangle (cr, event->area.x, event->area.y, event->area.width, event->area.height);
 
-       float r, g, b;
-       r = g = b = 0.1;
+       double r, g, b, a;
        if (_send_mode) {
-               rgba_p_from_style("SendStripBase", &r, &g, &b, "fg");
+               ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->color ("send strip base"), r, g, b, a);
        }
        if (!panner_shell->bypassed()) {
                cairo_set_source_rgba (cr, r, g, b, 1.0);
@@ -506,7 +508,7 @@ Panner2d::on_expose_event (GdkEventExpose *event)
 
                cairo_select_font_face (cr, "sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
 
-               if (small) {
+               if (xsmall) {
                        arc_radius = 4.0;
                } else {
                        cairo_set_font_size (cr, 10);
@@ -552,12 +554,12 @@ Panner2d::on_expose_event (GdkEventExpose *event)
                                        cairo_set_source_rgba (cr, 0.517, 0.772, 0.882, 0.8);
                                        cairo_stroke (cr);
 
-                                       if (!small && !signal->text.empty()) {
+                                       if (!xsmall && !signal->text.empty()) {
                                                cairo_set_source_rgba (cr, 0.517, 0.772, 0.882, .9);
                                                /* the +/- adjustments are a hack to try to center the text in the circle
                                                 * TODO use pango get_pixel_size() -- see mono_panner.cc
                                                 */
-                                               if (small) {
+                                               if (xsmall) {
                                                        cairo_move_to (cr, c.x - 1, c.y + 1);
                                                } else {
                                                        cairo_move_to (cr, c.x - 4, c.y + 4);
@@ -592,7 +594,7 @@ Panner2d::on_expose_event (GdkEventExpose *event)
                                cairo_move_to (cr, c.x, c.y);
                                cairo_save (cr);
                                cairo_rotate (cr, -(sp.azi/360.0) * (2.0 * M_PI));
-                               if (small) {
+                               if (xsmall) {
                                        cairo_scale (cr, 0.8, 0.8);
                                } else {
                                        cairo_scale (cr, 1.2, 1.2);
@@ -610,7 +612,7 @@ Panner2d::on_expose_event (GdkEventExpose *event)
                                cairo_fill (cr);
                                cairo_restore (cr);
 
-                               if (!small) {
+                               if (!xsmall) {
                                        cairo_set_font_size (cr, 16);
 
                                        /* move the text in just a bit */