From 9cb6c67f7b0fb50d677ed8cf7332059a76b42461 Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Mon, 15 May 2023 12:14:56 -0500 Subject: [PATCH] when coloring tracks: prefer the first strip-palette color, not a bg color --- gtk2_ardour/route_ui.cc | 5 ++++- gtk2_ardour/vca_master_strip.cc | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index ea2a524e93..6f17fbf196 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -369,7 +369,10 @@ RouteUI::set_route (std::shared_ptr rp) if (UIConfiguration::instance().get_use_palette_for_new_route ()) { set_color (gdk_color_to_rgba (AxisView::round_robin_palette_color ())); } else { - set_color (UIConfiguration::instance ().color (X_("neutral:midground"))); + string cp = UIConfiguration::instance().get_stripable_color_palette (); + Gdk::ArrayHandle_Color gc = ColorSelection::palette_from_string (cp); + std::vector c (gc); + set_color (gdk_color_to_rgba (c[0])); } } diff --git a/gtk2_ardour/vca_master_strip.cc b/gtk2_ardour/vca_master_strip.cc index 15864fb645..2c9cce0317 100644 --- a/gtk2_ardour/vca_master_strip.cc +++ b/gtk2_ardour/vca_master_strip.cc @@ -67,7 +67,10 @@ VCAMasterStrip::VCAMasterStrip (Session* s, std::shared_ptr v) if (UIConfiguration::instance().get_use_palette_for_new_vca ()) { _vca->presentation_info().set_color (Gtkmm2ext::gdk_color_to_rgba (AxisView::round_robin_palette_color ())); } else { - _vca->presentation_info().set_color (UIConfiguration::instance ().color (X_("neutral:midground"))); + string cp = UIConfiguration::instance().get_stripable_color_palette (); + Gdk::ArrayHandle_Color gc = ColorSelection::palette_from_string (cp); + std::vector c (gc); + _vca->presentation_info().set_color (gdk_color_to_rgba (c[0])); } }