I can't believe it's not one canvas! (TM)

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

6 files changed, 55 insertions, 16 deletions

diff --git a/gtk2_ardour/ardour2_ui_dark.rc.in b/gtk2_ardour/ardour2_ui_dark.rc.in
index a471eeeeed..1420fc8660 100644
--- a/gtk2_ardour/ardour2_ui_dark.rc.in
+++ b/gtk2_ardour/ardour2_ui_dark.rc.in
@@ -694,6 +694,31 @@ style "editor_time_ruler" = "small_text"
 	bg[NORMAL] = { 0.09, 0.09, 0.09 }
 }
 
+style "time_bar_label_base" = "default_base"
+{
+  font_name = "sans 6"
+  fg[NORMAL] = { 0.77, 0.77, 0.72 }	
+  bg[NORMAL] = { 0.28, 0.29, 0.34 }
+  bg[ACTIVE] = { 0.30, 0.30, 0.34 }	
+  bg[PRELIGHT] = { 0.30, 0.30, 0.34 }
+  bg[INSENSITIVE] = { 0.30, 0.30, 0.34 }
+  bg[SELECTED] = { 0.30, 0.30, 0.34 }
+}
+
+style "time_bar_padding" = "default_base"
+{
+  fg[NORMAL] = { 0.09, 0.09, 0.09 }
+  fg[ACTIVE] = { 0.09, 0.09, 0.09 }	
+  fg[PRELIGHT] = { 0.09, 0.09, 0.09 }
+  fg[INSENSITIVE] = { 0.09, 0.09, 0.09 }
+  fg[SELECTED] = { 0.09, 0.09, 0.09 }
+  bg[NORMAL] = { 0.09, 0.09, 0.09 }
+  bg[ACTIVE] = { 0.09, 0.09, 0.09 }	
+  bg[PRELIGHT] = { 0.09, 0.09, 0.09 }
+  bg[INSENSITIVE] = { 0.09, 0.09, 0.09 }
+  bg[SELECTED] = { 0.09, 0.09, 0.09 }
+}
+
 style "audio_bus_base"
 {
   font_name = "%FONT_SMALLER%"
@@ -839,11 +864,11 @@ style "treeview_display" = "small_bold_text"
 
 style "main_canvas_area"
 {
-	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 }
+	bg[NORMAL] = { 0.40, 0.40, 0.44 }
+	bg[ACTIVE] = { 0.40, 0.40, 0.44 }
+	bg[INSENSITIVE] = { 0.40, 0.40, 0.44 }
+	bg[SELECTED] = { 0.40, 0.40, 0.44 }
+	bg[PRELIGHT] = { 0.40, 0.40, 0.44 }
 }
 
 style "track_controls_inactive"
@@ -1323,6 +1348,8 @@ widget "*MinSecRuler" style:highest "editor_time_ruler"
 widget "*BaseFrame" style:highest "base_frame"
 widget "*AudioTrackStripBase" style:highest "audio_track_base"
 widget "*MidiTrackStripBase" style:highest "midi_track_base"
+widget "*TimebarLabelBase" style:highest "time_bar_label_base"
+widget "*TimebarPadding" style:highest "time_bar_padding"
 widget "*TimeAxisViewControlsBaseUnselected" style:highest "audio_track_base"
 widget "*AudioTrackControlsBaseUnselected" style:highest "audio_track_base"
 widget "*MidiTrackControlsBaseUnselected" style:highest "midi_track_base"
diff --git a/gtk2_ardour/ardour2_ui_default.conf b/gtk2_ardour/ardour2_ui_default.conf
index 368d755087..624398b1f0 100644
--- a/gtk2_ardour/ardour2_ui_default.conf
+++ b/gtk2_ardour/ardour2_ui_default.conf
@@ -74,8 +74,8 @@
     <Option name="RecordingRect" value="e5c6c6ff"/>
     <Option name="SelectionRect" value="e8f4d377"/>
     <Option name="Selection" value="636363b2"/>
-    <Option name="VestigialFrame" value="44007c0f"/>
-    <Option name="TimeAxisFrame" value="44007c0f"/>
+    <Option name="VestigialFrame" value="0000000f"/>
+    <Option name="TimeAxisFrame" value="0000000f"/>
     <Option name="NameHighlightFill" value="0000ffff"/>
     <Option name="NameHighlightOutline" value="7c00ff96"/>
     <Option name="FrameHandle" value="7c00ff96"/>
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 1d57a5d138..ee5ce838bb 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -371,13 +371,20 @@ Editor::Editor ()
 
  	edit_cursor_clock.ValueChanged.connect (mem_fun(*this, &Editor::edit_cursor_clock_changed));
 	
+	ArdourCanvas::Canvas* time_pad = manage(new ArdourCanvas::Canvas());
+	ArdourCanvas::SimpleLine* pad_line_1 = manage(new ArdourCanvas::SimpleLine(*time_pad->root(),
+			0.0, 1.0, 100.0, 1.0));
+	pad_line_1->property_color_rgba() = 0xFF0000FF;
+	pad_line_1->show();
+	time_pad->show();
+
 	time_canvas_vbox.pack_start (*_ruler_separator, false, false);
 	time_canvas_vbox.pack_start (*minsec_ruler, false, false);
 	time_canvas_vbox.pack_start (*smpte_ruler, false, false);
 	time_canvas_vbox.pack_start (*frames_ruler, false, false);
 	time_canvas_vbox.pack_start (*bbt_ruler, false, false);
 	time_canvas_vbox.pack_start (time_canvas, true, true);
-	time_canvas_vbox.set_size_request (-1, (int)(timebar_height * visible_timebars) + 2);
+	time_canvas_vbox.set_size_request (-1, (int)(timebar_height * visible_timebars) + 5);
 
 	bbt_label.set_name ("EditorTimeButton");
 	bbt_label.set_size_request (-1, (int)timebar_height);
@@ -425,13 +432,15 @@ Editor::Editor ()
 	time_button_vbox.pack_start (mark_label, false, false);
 
 	time_button_event_box.add (time_button_vbox);
+	time_button_event_box.set_name ("TimebarLabelBase");
+	time_button_frame.set_shadow_type (Gtk::SHADOW_NONE);
 	
 	time_button_event_box.set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
-	time_button_event_box.set_name ("TimebarLabelBase");
 	time_button_event_box.signal_button_release_event().connect (mem_fun(*this, &Editor::ruler_label_button_release));
 
-	time_button_frame.add(time_button_event_box);
-	time_button_frame.property_shadow_type() = Gtk::SHADOW_OUT;
+	time_button_frame.add (time_button_event_box);
+	time_button_frame.set_name ("TimebarLabelBase");
+	time_button_frame.set_shadow_type (Gtk::SHADOW_ETCHED_OUT);
 
 	/* these enable us to have a dedicated window (for cursor setting, etc.) 
 	   for the canvas areas.
@@ -450,7 +459,7 @@ Editor::Editor ()
 	
 	edit_packer.attach (edit_vscrollbar,         3, 4, 1, 2,    FILL,        FILL|EXPAND, 0, 0);
 
-	edit_packer.attach (time_button_frame,       0, 2, 0, 1,    FILL,        FILL, 0, 0);
+	edit_packer.attach (time_button_frame,       0, 2, 0, 1,    FILL,        SHRINK, 0, 0);
 	edit_packer.attach (time_canvas_event_box,   2, 4, 0, 1,    FILL|EXPAND, FILL, 0, 0);
 
 	edit_packer.attach (controls_layout,         1, 2, 1, 2,    FILL,        FILL|EXPAND, 0, 0);
diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index 9b57568af7..cfc7157510 100644
--- a/gtk2_ardour/editor_rulers.cc
+++ b/gtk2_ardour/editor_rulers.cc
@@ -57,8 +57,9 @@ Editor::initialize_rulers ()
 	
 	_ruler_separator = new Gtk::HSeparator();
 	_ruler_separator->set_size_request(-1, 2);
+	_ruler_separator->set_name("TimebarPadding");
 	_ruler_separator->show();
-
+	
 	_smpte_ruler = gtk_custom_hruler_new ();
 	smpte_ruler = Glib::wrap (_smpte_ruler);
 	smpte_ruler->set_name ("SMPTERuler");
@@ -608,9 +609,9 @@ Editor::update_ruler_visibility ()
 	bbt_ruler->signal_motion_notify_event().connect (mem_fun(*this, &Editor::ruler_mouse_motion));
 	frames_ruler->signal_motion_notify_event().connect (mem_fun(*this, &Editor::ruler_mouse_motion));
 	minsec_ruler->signal_motion_notify_event().connect (mem_fun(*this, &Editor::ruler_mouse_motion));
-
-	ruler_children.insert (canvaspos, Element(*_ruler_separator, PACK_SHRINK, PACK_START));
 	
+	ruler_children.insert (canvaspos, Element(*_ruler_separator, PACK_SHRINK, PACK_START));
+
 	if (ruler_shown[ruler_metric_minsec]) {
 		lab_children.push_back (Element(minsec_label, PACK_SHRINK, PACK_START));
 		ruler_children.insert (canvaspos, Element(*minsec_ruler, PACK_SHRINK, PACK_START));
diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc
index 1b7e9028f2..614901e11a 100644
--- a/gtk2_ardour/streamview.cc
+++ b/gtk2_ardour/streamview.cc
@@ -67,7 +67,7 @@ StreamView::StreamView (RouteTimeAxisView& tv)
 	canvas_rect->property_y1() = 0.0;
 	canvas_rect->property_x2() = _trackview.editor.frame_to_pixel (max_frames);
 	canvas_rect->property_y2() = (double) tv.height;
-	canvas_rect->property_outline_what() = (guint32) (0x1|0x2|0x8);  // outline ends and bottom 
+	canvas_rect->property_outline_what() = (guint32) (0x2|0x8);  // outline RHS and bottom 
 	// (Fill/Outline colours set in derived classes)
 
 	canvas_rect->signal_event().connect (bind (mem_fun (_trackview.editor, &PublicEditor::canvas_stream_view_event), canvas_rect, &_trackview));
diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc
index 2ba90e1e63..f4316efd87 100644
--- a/gtk2_ardour/time_axis_view_item.cc
+++ b/gtk2_ardour/time_axis_view_item.cc
@@ -152,6 +152,7 @@ TimeAxisViewItem::init (const string& it_name, double spu, Gdk::Color& base_colo
 	vestigial_frame->property_y1() = (double) 1.0;
 	vestigial_frame->property_x2() = 2.0;
 	vestigial_frame->property_y2() = (double) trackview.height;
+	vestigial_frame->property_outline_what() = 0xF;
 	vestigial_frame->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_VestigialFrame.get();
 	vestigial_frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_VestigialFrame.get();
 	vestigial_frame->hide ();
@@ -162,6 +163,7 @@ TimeAxisViewItem::init (const string& it_name, double spu, Gdk::Color& base_colo
 		frame->property_y1() = (double) 1.0;
 		frame->property_x2() = (double) trackview.editor.frame_to_pixel(duration);
 		frame->property_y2() = (double) trackview.height;
+		frame->property_outline_what() = 0xF;
 		frame->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_TimeAxisFrame.get();
 		frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TimeAxisFrame.get();