diff options
| author | Ben Loftis <ben@harrisonconsoles.com> | 2018-02-27 16:39:49 -0600 |
|---|---|---|
| committer | Ben Loftis <ben@harrisonconsoles.com> | 2018-02-27 16:39:49 -0600 |
| commit | e069b0c7975d301cdee48cc3925b7f1bfcb1d9bd (patch) | |
| tree | bf4082617c0ed1cb7e2001c092ff8e0027aaf8aa /gtk2_ardour/grid_lines.cc | |
| parent | d88cdcc1bf175b7c09aa3bee0ed075f838c2c423 (diff) | |
Implement grid line colors ( was: measure lines ). This restores measure lines to a brighter color than beats.
Diffstat (limited to 'gtk2_ardour/grid_lines.cc')
| -rw-r--r-- | gtk2_ardour/grid_lines.cc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/gtk2_ardour/grid_lines.cc b/gtk2_ardour/grid_lines.cc index c091fa395c..bdaf870054 100644 --- a/gtk2_ardour/grid_lines.cc +++ b/gtk2_ardour/grid_lines.cc @@ -58,13 +58,21 @@ GridLines::draw (std::vector<Ruler::Mark> marks) { lines.clear(); - const uint32_t c = UIConfiguration::instance().color_mod("measure line beat", "measure line beat"); + const uint32_t major_color = UIConfiguration::instance().color_mod("grid line major", "grid line"); + const uint32_t minor_color = UIConfiguration::instance().color_mod("grid line minor", "grid line"); + const uint32_t micro_color = UIConfiguration::instance().color_mod("grid line micro", "grid line"); for (vector<Ruler::Mark>::const_iterator m = marks.begin(); m != marks.end(); ++m) { samplepos_t s = m->position; - lines.add (PublicEditor::instance().sample_to_pixel_unrounded (s), 1.0, c); + if ((*m).style == ArdourCanvas::Ruler::Mark::Major) { + lines.add (PublicEditor::instance().sample_to_pixel_unrounded (s), 1.0, major_color); + } else if ((*m).style == ArdourCanvas::Ruler::Mark::Minor) { + lines.add (PublicEditor::instance().sample_to_pixel_unrounded (s), 1.0, minor_color); + } else { + lines.add (PublicEditor::instance().sample_to_pixel_unrounded (s), 1.0, micro_color); + } } } |