diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-19 10:03:40 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-19 11:15:22 -0400 |
| commit | 41bd6d3721f20e5c7a668c4566cef65a06a95c7f (patch) | |
| tree | 7ec123dd8f3aabc08948853e60814d895dd0c02c /gtk2_ardour | |
| parent | e44ae422ebb5c1b18cc03cb2254e3cf3308565e0 (diff) | |
fix unintentionally edited color/theme name from f2s edit
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/automation_region_view.cc | 6 | ||||
| -rw-r--r-- | gtk2_ardour/midi_region_view.cc | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc index 9e8ba910ad..b9a78c7373 100644 --- a/gtk2_ardour/automation_region_view.cc +++ b/gtk2_ardour/automation_region_view.cc @@ -83,7 +83,7 @@ AutomationRegionView::init (bool /*wfd*/) set_height (trackview.current_height()); - fill_color_name = "midi sample base"; + fill_color_name = "midi frame base"; set_colors (); _enable_display = true; @@ -110,11 +110,11 @@ AutomationRegionView::get_fill_color() const { const std::string mod_name = (_dragging ? "dragging region" : trackview.editor().internal_editing() ? "editable region" : - "midi sample base"); + "midi frame base"); if (_selected) { return UIConfiguration::instance().color_mod ("selected region base", mod_name); } 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); } diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index c751c5f58b..081315dcef 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -269,7 +269,7 @@ MidiRegionView::init (bool wfd) _model = midi_region()->midi_source(0)->model(); _enable_display = false; - fill_color_name = "midi sample base"; + fill_color_name = "midi frame base"; RegionView::init (false); @@ -3643,12 +3643,12 @@ MidiRegionView::get_fill_color() const { const std::string mod_name = (_dragging ? "dragging region" : trackview.editor().internal_editing() ? "editable region" : - "midi sample base"); + "midi frame base"); if (_selected) { return UIConfiguration::instance().color_mod ("selected region base", mod_name); } else if ((!UIConfiguration::instance().get_show_name_highlight() || 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); } |