diff options
| author | David Robillard <d@drobilla.net> | 2006-11-14 06:10:46 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-11-14 06:10:46 +0000 |
| commit | d36c15fd45566e7cbf03003049dd43cdf21138c0 (patch) | |
| tree | ff8a3a9a0a90812c4a58f433214e28aa126d5de0 | |
| parent | 78e6e3f5ffb9e505f27ec2279fb88ba0265530fa (diff) | |
Fixed reversed bar/beat colours
git-svn-id: svn://localhost/ardour2/trunk@1129 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/ardour.colors | 4 | ||||
| -rw-r--r-- | gtk2_ardour/editor_tempodisplay.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/ardour.colors b/gtk2_ardour/ardour.colors index f8aa244234..8b648e8872 100644 --- a/gtk2_ardour/ardour.colors +++ b/gtk2_ardour/ardour.colors @@ -65,8 +65,8 @@ cEnteredAutomationLine 0.87 0.39 0.39 1.00 cEnteredMarker 0.87 0.39 0.39 1.00 cMeterMarker 0.95 0.26 0.36 1.00 cTempoMarker 0.95 0.26 0.36 1.00 -cMeasureLineBeat 0.55 0.55 0.55 1.00 -cMeasureLineBar 0.45 0.45 0.45 1.00 +cMeasureLineBeat 0.40 0.40 0.40 0.50 +cMeasureLineBar 0.55 0.55 0.60 0.70 cGhostTrackBaseOutline 0.00 0.00 0.00 1.00 cGhostTrackBaseFill 0.27 0.00 0.49 0.50 cImageTrackBase 0.87 0.87 0.85 1.00 diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index 3285d44e01..da856aa8a4 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -231,9 +231,9 @@ Editor::draw_measures () case TempoMap::Beat: if ((*i).beat == 1) { - color = color_map[cMeasureLineBeat]; - } else { color = color_map[cMeasureLineBar]; + } else { + color = color_map[cMeasureLineBeat]; if (beat_density > 2.0) { /* only draw beat lines if the gaps between beats are large. |