Unify gain and draw tools.

[ardour.git] / gtk2_ardour / control_point.cc

diff --git a/gtk2_ardour/control_point.cc b/gtk2_ardour/control_point.cc
index 5343ff5f24a0fde8453cbde5d171b21063c3ce57..ea50f8bab86c9510a21e777d88f4f7a8fe45c3d0 100644 (file)
--- a/gtk2_ardour/control_point.cc
+++ b/gtk2_ardour/control_point.cc
@@ -44,9 +44,9 @@ ControlPoint::ControlPoint (AutomationLine& al)
        _size = 4.0;
 
        _item = new ArdourCanvas::Rectangle (&_line.canvas_group());
-       _item->set_fill (false);
-       _item->set_fill_color (ARDOUR_UI::config()->get_canvasvar_ControlPointFill());
-       _item->set_outline_color (ARDOUR_UI::config()->get_canvasvar_ControlPointOutline());
+       _item->set_fill (true);
+       _item->set_fill_color (ARDOUR_UI::config()->get_ControlPointFill());
+       _item->set_outline_color (ARDOUR_UI::config()->get_ControlPointOutline());
        _item->set_data ("control_point", this);
        _item->Event.connect (sigc::mem_fun (this, &ControlPoint::event_handler));
 
@@ -69,8 +69,8 @@ ControlPoint::ControlPoint (const ControlPoint& other, bool /*dummy_arg_to_force
        _size = other._size;
 
        _item = new ArdourCanvas::Rectangle (&_line.canvas_group());
-       _item->set_fill (false);
-       _item->set_outline_color (ARDOUR_UI::config()->get_canvasvar_ControlPointOutline());
+       _item->set_fill (true);
+       _item->set_outline_color (ARDOUR_UI::config()->get_ControlPointOutline());
 
        /* NOTE: no event handling in copied ControlPoints */
 
@@ -122,13 +122,13 @@ ControlPoint::set_color ()
        uint32_t color = 0;
 
        if (_selected) {
-               color = ARDOUR_UI::config()->get_canvasvar_ControlPointSelected();
+               color = ARDOUR_UI::config()->get_ControlPointSelected();
        } else {
-               color = ARDOUR_UI::config()->get_canvasvar_ControlPointOutline();
+               color = ARDOUR_UI::config()->get_ControlPointOutline();
        }
 
        _item->set_outline_color (color);
-       _item->set_fill_color (ARDOUR_UI::config()->get_canvasvar_ControlPointFill());
+       _item->set_fill_color (ARDOUR_UI::config()->get_ControlPointFill());
 }
 
 void
@@ -167,8 +167,8 @@ ControlPoint::move_to (double x, double y, ShapeType shape)
        _shape = shape;
 }
 
-void
-ControlPoint::i2w (double& x, double& y) const
+ArdourCanvas::Item&
+ControlPoint::item() const 
 {
-       _item->item_to_canvas (x, y);
+       return *_item;
 }