Bar/Beat line aesthetic fixes.

git-svn-id: svn://localhost/ardour2/trunk@958 d708f5d6-7413-0410-9779-e7cbd77b26cf

2 files changed, 15 insertions, 19 deletions

diff --git a/gtk2_ardour/ardour.colors b/gtk2_ardour/ardour.colors
index cc514890fc..7dbb46f947 100644
--- a/gtk2_ardour/ardour.colors
+++ b/gtk2_ardour/ardour.colors
@@ -5,11 +5,11 @@ cFrameBase 0.75 0.75 0.76 1.0
 cAudioTrackBase 0.79 0.80 0.85 0.41
 cAudioTrackOutline 0.00 0.00 0.00 1.00
 cAudioBusBase 0.90 0.82 0.90 0.41
-cTempoBar 0.64 0.64 0.66 1.0
-cMeterBar 0.75 0.75 0.80 1.0
-cMarkerBar 0.54 0.54 0.56 1.0
-cRangeMarkerBar 0.48 0.48 0.50 1.0
-cTransportMarkerBar 0.40 0.40 0.42 1.0
+cMeterBar 0.40 0.40 0.40 1.0
+cTempoBar 0.45 0.45 0.45 1.0
+cMarkerBar 0.50 0.50 0.50 1.0
+cRangeMarkerBar 0.55 0.55 0.55 1.0
+cTransportMarkerBar 0.60 0.60 0.60 1.0
 cTimeStretchFill 0.89 0.71 0.71 0.59
 cTimeStretchOutline 0.39 0.39 0.39 0.59
 cAutomationLine 0.27 0.74 0.35 1.0
@@ -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.51 0.59 0.87 0.98
-cMeasureLineBar 0.68 0.68 0.59 0.94
+cMeasureLineBeat 0.7 0.7 0.7 0.94
+cMeasureLineBar 0.5 0.5 0.5 0.98
 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 2e01f68eb8..270ea38b2e 100644
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -210,12 +210,10 @@ Editor::draw_measures ()
 
 	beat_density =  (beats * 10.0f) / track_canvas.get_width ();
 
-	if (beat_density > 2.0f) {
-	        /* 
-		   if the lines are too close together, 
-		   they become useless 
-		*/
-	        return;
+	if (beat_density > 4.0f) {
+		/* if the lines are too close together, they become useless
+		 */
+		return;
 	}
 
 	for (i = current_bbt_points->begin(); i != current_bbt_points->end(); ++i) {
@@ -231,12 +229,10 @@ Editor::draw_measures ()
 			} else {
 				color = color_map[cMeasureLineBar];
 
-				/* only draw beat lines if the gaps between beats
-				   are large.
-				*/
-
-				if (beat_density > 0.25) {
-				  break;
+				if (beat_density > 2.0) {
+					/* only draw beat lines if the gaps between beats are large.
+					*/
+					break;
 				}
 			}