From c15556568ec4fa113b01c04948e0fb577a992972 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 14 Jan 2025 15:26:38 -0700 Subject: [PATCH] revert some of the logic of control-points-inherit-line-color for selected CPs --- gtk2_ardour/control_point.cc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gtk2_ardour/control_point.cc b/gtk2_ardour/control_point.cc index aef2299379..e29cdcee36 100644 --- a/gtk2_ardour/control_point.cc +++ b/gtk2_ardour/control_point.cc @@ -122,15 +122,16 @@ ControlPoint::reset (double x, double y, AutomationList::iterator mi, uint32_t v void ControlPoint::set_color () { - if (_line.control_points_inherit_color()) { + if (_selected) { - _item->set_outline_color(_line.get_line_color()); - _item->set_fill_color(_line.get_line_fill_color ()); + _item->set_outline_color(UIConfiguration::instance().color ("control point selected outline"));; + _item->set_fill_color(UIConfiguration::instance().color ("control point selected fill")); } else { - if (_selected) { - _item->set_outline_color(UIConfiguration::instance().color ("control point selected outline"));; - _item->set_fill_color(UIConfiguration::instance().color ("control point selected fill")); + + if (_line.control_points_inherit_color()) { + _item->set_outline_color(_line.get_line_color()); + _item->set_fill_color(_line.get_line_fill_color ()); } else { _item->set_outline_color(UIConfiguration::instance().color ("control point outline")); _item->set_fill_color(UIConfiguration::instance().color ("control point fill"));