From ce08ec0de0b0b077d9b28533c23886607991d144 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 9 Jun 2014 23:28:32 -0400 Subject: substantial changes in color management, involving a reduction in the use of Gdk::Color and more consistent logic for region coloring. Group tabs now also get the text drawn in an appropriately contrast-y color --- gtk2_ardour/route_group_dialog.cc | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'gtk2_ardour/route_group_dialog.cc') diff --git a/gtk2_ardour/route_group_dialog.cc b/gtk2_ardour/route_group_dialog.cc index bba72fb4a8..0919a715ae 100644 --- a/gtk2_ardour/route_group_dialog.cc +++ b/gtk2_ardour/route_group_dialog.cc @@ -17,15 +17,20 @@ */ +#include + +#include "ardour/route_group.h" +#include "ardour/session.h" + #include #include #include -#include "ardour/route_group.h" -#include "ardour/session.h" + #include "route_group_dialog.h" #include "group_tabs.h" +#include "utils.h" + #include "i18n.h" -#include using namespace Gtk; using namespace ARDOUR; @@ -84,7 +89,10 @@ RouteGroupDialog::RouteGroupDialog (RouteGroup* g, bool creating_new) _name.set_text (_group->name ()); _active.set_active (_group->is_active ()); - _color.set_color (GroupTabs::group_color (_group)); + + Gdk::Color c; + set_color_from_rgba (c, GroupTabs::group_color (_group)); + _color.set_color (c); VBox* options_box = manage (new VBox); options_box->set_spacing (6); @@ -212,7 +220,7 @@ RouteGroupDialog::update () _group->apply_changes (plist); - GroupTabs::set_group_color (_group, _color.get_color ()); + GroupTabs::set_group_color (_group, gdk_color_to_rgba (_color.get_color ())); } void -- cgit v1.2.3