Decreased region opacity, smoothed out canvas/tempo line colours.

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

diff --git a/gtk2_ardour/ardour.colors b/gtk2_ardour/ardour.colors
index 8b648e8872c15a348d64758cb9843a386abe03f6..ca2baa13631cf1aa69221cf03175495a2ee6b9d2 100644 (file)
--- 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.40 0.40 0.40 0.50
-cMeasureLineBar 0.55 0.55 0.60 0.70
+cMeasureLineBeat 0.45 0.45 0.45 0.40
+cMeasureLineBar 0.55 0.55 0.60 0.55
 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/ardour2_ui.rc b/gtk2_ardour/ardour2_ui.rc
index a0fe615eaf08154d87c46409e4f34f2f20e57a9b..766203e40d4a22dd02344a27d07dd1bc7e755c94 100644 (file)
--- a/gtk2_ardour/ardour2_ui.rc
+++ b/gtk2_ardour/ardour2_ui.rc
@@ -689,11 +689,11 @@ style "treeview_display" = "small_bold_text"
 
 style "main_canvas_area"
 {
-       bg[NORMAL] = { 0.20, 0.20, 0.25 }
-       bg[ACTIVE] = { 0.20, 0.20, 0.25 }
-       bg[INSENSITIVE] = { 0.20, 0.20, 0.25 }
-       bg[SELECTED] = { 0.20, 0.20, 0.25 }
-       bg[PRELIGHT] = { 0.20, 0.20, 0.25 }
+       bg[NORMAL] = { 0.30, 0.30, 0.34 }
+       bg[ACTIVE] = { 0.30, 0.30, 0.34 }
+       bg[INSENSITIVE] = { 0.30, 0.30, 0.34 }
+       bg[SELECTED] = { 0.30, 0.30, 0.34 }
+       bg[PRELIGHT] = { 0.30, 0.30, 0.34 }
 }
 
 style "track_controls_inactive"

diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc
index 7f6cbfb193bf0f07a29de4e3ec55b7b8123a7307..c615fdae0cb3cde0f35231c2b021f2820fdb4c95 100644 (file)
--- a/gtk2_ardour/region_view.cc
+++ b/gtk2_ardour/region_view.cc
@@ -359,9 +359,9 @@ void
 RegionView::set_frame_color ()
 {
        if (_region->opaque()) {
-               fill_opacity = 230;
+               fill_opacity = 130;
        } else {
-               fill_opacity = 100;
+               fill_opacity = 60;
        }
 
        TimeAxisViewItem::set_frame_color ();

diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc
index 6af38deaee2e99ff3f589514dac7aa1a3bacef42..a008e2af1a97bf54ef254a1f8eff2eaaf7a23c0c 100644 (file)
--- a/gtk2_ardour/time_axis_view_item.cc
+++ b/gtk2_ardour/time_axis_view_item.cc
@@ -102,7 +102,7 @@ TimeAxisViewItem::TimeAxisViewItem(const string & it_name, ArdourCanvas::Group&
        frame_position = start ;
        item_duration = duration ;
        name_connected = false;
-       fill_opacity = 230;
+       fill_opacity = 130;
        position_locked = false ;
        max_item_duration = ARDOUR::max_frames;
        min_item_duration = 0 ;