ardour/livetrax
13
0
Fork 0
Code

Remove "midi frame base", consistent TAV color (1/2)

Browse Source
This commit is contained in:
Robin Gareus 2022-12-09 23:10:51 +01:00
parent 0bb81a9a18
commit 3442500002
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk2_ardour/automation_region_view.cc
View File

@ -87,7 +87,6 @@ AutomationRegionView::init (bool /*wfd*/)
set_height (trackview.current_height()); set_height (trackview.current_height());
fill_color_name = "midi frame base";
set_colors (); set_colors ();
} }
@ -110,12 +109,11 @@ uint32_t
AutomationRegionView::get_fill_color() const AutomationRegionView::get_fill_color() const
{ {
const std::string mod_name = (_dragging ? "dragging region" : const std::string mod_name = (_dragging ? "dragging region" :
trackview.editor().internal_editing() ? "editable region" : trackview.editor().internal_editing() ? "editable region" : fill_color_name);
"midi frame base");
if (_selected) { if (_selected) {
return UIConfiguration::instance().color_mod ("selected region base", mod_name); return UIConfiguration::instance().color_mod ("selected region base", mod_name);
} else if (high_enough_for_name || !UIConfiguration::instance().get_color_regions_using_track_color()) { } else if (high_enough_for_name || !UIConfiguration::instance().get_color_regions_using_track_color()) {
return UIConfiguration::instance().color_mod ("midi frame base", mod_name); return UIConfiguration::instance().color_mod (fill_color_name, mod_name);
} }
return UIConfiguration::instance().color_mod (fill_color, mod_name); return UIConfiguration::instance().color_mod (fill_color, mod_name);
} }

3
gtk2_ardour/ghostregion.cc
View File

@ -164,13 +164,14 @@ AudioGhostRegion::set_colors ()
if (is_automation_ghost()) { if (is_automation_ghost()) {
fill_color = UIConfiguration::instance().color ("ghost track wave fill"); fill_color = UIConfiguration::instance().color ("ghost track wave fill");
fill_color = UIConfiguration::instance().color_mod("ghost track wave fill", "region alpha");
} }
else { else {
fill_color = source_track_color(200); fill_color = source_track_color(200);
} }
for (uint32_t n=0; n < waves.size(); ++n) { for (uint32_t n=0; n < waves.size(); ++n) {
waves[n]->set_outline_color (UIConfiguration::instance().color ("ghost track wave")); waves[n]->set_outline_color (UIConfiguration::instance().color_mod ("ghost track wave", "region alpha"));
waves[n]->set_fill_color (fill_color); waves[n]->set_fill_color (fill_color);
waves[n]->set_clip_color (UIConfiguration::instance().color ("ghost track wave clip")); waves[n]->set_clip_color (UIConfiguration::instance().color ("ghost track wave clip"));
waves[n]->set_zero_color (UIConfiguration::instance().color ("ghost track zero line")); waves[n]->set_zero_color (UIConfiguration::instance().color ("ghost track zero line"));

4
gtk2_ardour/midi_region_view.cc
View File

@ -262,8 +262,6 @@ MidiRegionView::init (bool /*wfd*/)
_model = midi_region()->midi_source(0)->model(); _model = midi_region()->midi_source(0)->model();
assert (_model); assert (_model);
fill_color_name = "midi frame base";
RegionView::init (false); RegionView::init (false);
//set_height (trackview.current_height()); //set_height (trackview.current_height());
@ -3700,7 +3698,7 @@ MidiRegionView::get_fill_color() const
if ((!UIConfiguration::instance().get_show_name_highlight() || high_enough_for_name) && if ((!UIConfiguration::instance().get_show_name_highlight() || high_enough_for_name) &&
!UIConfiguration::instance().get_color_regions_using_track_color()) { !UIConfiguration::instance().get_color_regions_using_track_color()) {
return UIConfiguration::instance().color_mod ("midi frame base", mod_name); return UIConfiguration::instance().color_mod (fill_color_name, mod_name);
} }
return UIConfiguration::instance().color_mod (fill_color, mod_name); return UIConfiguration::instance().color_mod (fill_color, mod_name);