ardour/livetrax
13
0
Fork 0
Code

fix unintentionally edited color/theme name from f2s edit

Browse Source
This commit is contained in:
Paul Davis 2017-09-19 10:03:40 -04:00
parent e44ae422eb
commit 41bd6d3721
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk2_ardour/automation_region_view.cc
View File

@ -83,7 +83,7 @@ AutomationRegionView::init (bool /*wfd*/)
set_height (trackview.current_height()); set_height (trackview.current_height());
fill_color_name = "midi sample base"; fill_color_name = "midi frame base";
set_colors (); set_colors ();
_enable_display = true; _enable_display = true;
@ -110,11 +110,11 @@ 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" :
"midi sample base"); "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 sample base", mod_name); return UIConfiguration::instance().color_mod ("midi frame base", mod_name);
} }
return UIConfiguration::instance().color_mod (fill_color, mod_name); return UIConfiguration::instance().color_mod (fill_color, mod_name);
} }

6
gtk2_ardour/midi_region_view.cc
View File

@ -269,7 +269,7 @@ MidiRegionView::init (bool wfd)
_model = midi_region()->midi_source(0)->model(); _model = midi_region()->midi_source(0)->model();
_enable_display = false; _enable_display = false;
fill_color_name = "midi sample base"; fill_color_name = "midi frame base";
RegionView::init (false); RegionView::init (false);
@ -3643,12 +3643,12 @@ MidiRegionView::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" :
"midi sample base"); "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 ((!UIConfiguration::instance().get_show_name_highlight() || high_enough_for_name) && } else 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 sample base", mod_name); return UIConfiguration::instance().color_mod ("midi frame base", mod_name);
} }
return UIConfiguration::instance().color_mod (fill_color, mod_name); return UIConfiguration::instance().color_mod (fill_color, mod_name);
} }