projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
red-border selection for tracks, regions, and processors. requesting comments
[ardour.git]
/
gtk2_ardour
/
mixer_group_tabs.cc
diff --git
a/gtk2_ardour/mixer_group_tabs.cc
b/gtk2_ardour/mixer_group_tabs.cc
index 964849c515b68a2e688f3259c4bc315d85b8c0b0..03e9409df22b4dfc07b83e17e7f1192b88a92e85 100644
(file)
--- a/
gtk2_ardour/mixer_group_tabs.cc
+++ b/
gtk2_ardour/mixer_group_tabs.cc
@@
-25,6
+25,7
@@
#include "canvas/utils.h"
#include "canvas/utils.h"
+#include "ardour_ui.h"
#include "mixer_group_tabs.h"
#include "mixer_strip.h"
#include "mixer_ui.h"
#include "mixer_group_tabs.h"
#include "mixer_strip.h"
#include "mixer_ui.h"
@@
-37,6
+38,7
@@
using namespace std;
using namespace Gtk;
using namespace ARDOUR;
using namespace std;
using namespace Gtk;
using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
using namespace PBD;
MixerGroupTabs::MixerGroupTabs (Mixer_UI* m)
using namespace PBD;
MixerGroupTabs::MixerGroupTabs (Mixer_UI* m)
@@
-101,9
+103,7
@@
MixerGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const
if (tab.group && tab.group->is_active()) {
ArdourCanvas::color_to_rgba (tab.color, r, g, b, a);
} else {
if (tab.group && tab.group->is_active()) {
ArdourCanvas::color_to_rgba (tab.color, r, g, b, a);
} else {
- r = 0.0;
- g = 0.0;
- b = 0.0;
+ ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->get_canvasvar_InactiveGroupTab(), r, g, b, a);
}
a = 1.0;
}
a = 1.0;
@@
-121,7
+121,7
@@
MixerGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const
cairo_text_extents_t ext;
cairo_text_extents (cr, tab.group->name().c_str(), &ext);
cairo_text_extents_t ext;
cairo_text_extents (cr, tab.group->name().c_str(), &ext);
- ArdourCanvas::Color c = contrasting_text_color (ArdourCanvas::rgba_to_color (r, g, b, a));
+ ArdourCanvas::Color c =
ArdourCanvas::
contrasting_text_color (ArdourCanvas::rgba_to_color (r, g, b, a));
ArdourCanvas::color_to_rgba (c, r, g, b, a);
cairo_set_source_rgb (cr, r, g, b);
ArdourCanvas::color_to_rgba (c, r, g, b, a);
cairo_set_source_rgb (cr, r, g, b);