"fix" track heights etc.

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

6 files changed, 23 insertions, 22 deletions

diff --git a/gtk2_ardour/ardour2_ui.rc b/gtk2_ardour/ardour2_ui.rc
index 71f5d56e10..54a6723fd1 100644
--- a/gtk2_ardour/ardour2_ui.rc
+++ b/gtk2_ardour/ardour2_ui.rc
@@ -1080,7 +1080,7 @@ widget "*TransportSoloAlert.*" style "flashing_alert"
 widget "*TransportAuditioningAlert" style "flashing_alert"
 widget "*TransportAuditioningAlert.*" style "flashing_alert"
 widget "*Prompter" style "default_base"
-widget "*PrompterLabel" style "default_base"
+widget "*PrompterLabel" style "larger_bold_text"
 widget "*CleanupDialog" style "default_base"
 widget "*CleanupDialog*" style "default_base"
 widget "*FadeCurve" style "medium_bold_entry"
diff --git a/gtk2_ardour/ardour_message.cc b/gtk2_ardour/ardour_message.cc
index 5f761cb6b9..2948559f14 100644
--- a/gtk2_ardour/ardour_message.cc
+++ b/gtk2_ardour/ardour_message.cc
@@ -31,9 +31,10 @@ ArdourMessage::ArdourMessage (Gtk::Window* parent,
 			      string name, string msg, 
 			      bool grab_focus, bool auto_run)
 	: ArdourDialog (name),
-	  label (msg, 0.5, 0.5)
+	  label (msg)
 {
 	label.set_name (X_("PrompterLabel"));
+	label.set_justify (JUSTIFY_CENTER);
 	label.show ();
 
 	get_vbox()->pack_start (label);
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 3036bd55d4..faa58359e5 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -321,7 +321,7 @@ Editor::Editor (AudioEngine& eng)
 	ignore_route_list_reorder = false;
 	verbose_cursor_on = true;
 	route_removal = false;
-	track_spacing = 2;
+	track_spacing = 0;
 	show_automatic_regions_in_region_list = true;
 	have_pending_keyboard_selection = false;
 	_follow_playhead = true;
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 65f1f7a6cb..90714ed8df 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -2676,7 +2676,8 @@ Editor::region_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
 	if ((pointer_y_span = (drag_info.last_trackview->order - tv->order)) != 0) {
 
 		int32_t children = 0, numtracks = 0;
-		bitset <512> tracks (0x00);
+		// XXX hard coding track limit, oh my, so very very bad
+		bitset <1024> tracks (0x00);
 		/* get a bitmask representing the visible tracks */
 
 		for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index b9079159f4..8eb58d0c61 100644
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -130,7 +130,7 @@ TimeAxisView::TimeAxisView (ARDOUR::Session& sess, PublicEditor& ed, TimeAxisVie
 	controls_ebox.set_flags (CAN_FOCUS);
 
 	controls_ebox.signal_button_release_event().connect (mem_fun (*this, &TimeAxisView::controls_ebox_button_release));
-	controls_ebox.signal_scroll_event().connect (mem_fun (*this, &TimeAxisView::controls_ebox_scroll));
+	controls_ebox.signal_scroll_event().connect (mem_fun (*this, &TimeAxisView::controls_ebox_scroll), true);
 
 	controls_lhs_pad.set_name ("TimeAxisViewControlsPadding");
 	controls_hbox.pack_start (controls_lhs_pad,false,false);
@@ -140,6 +140,7 @@ TimeAxisView::TimeAxisView (ARDOUR::Session& sess, PublicEditor& ed, TimeAxisVie
 	controls_frame.add (controls_hbox);
 	controls_frame.set_name ("TimeAxisViewControlsBaseUnselected");
 	controls_frame.set_shadow_type (Gtk::SHADOW_OUT);
+
 }
 
 TimeAxisView::~TimeAxisView()
@@ -264,8 +265,6 @@ TimeAxisView::controls_ebox_scroll (GdkEventScroll* ev)
 bool
 TimeAxisView::controls_ebox_button_release (GdkEventButton* ev)
 {
-	cerr << "controls ebox button release button " << ev->button << endl;
-
 	switch (ev->button) {
 	case 1:
 		selection_click (ev);
@@ -352,22 +351,16 @@ TimeAxisView::step_height (bool bigger)
 	}
 }
 
-
 void
 TimeAxisView::set_height (TrackHeight h)
 {
-	height = (guint32) h;
-	controls_frame.set_size_request (-1, height+2);
+	height = (gint32) h;
+	controls_frame.set_size_request (-1, height);
 
  	if (canvas_item_visible (selection_group)) {
 		/* resize the selection rect */
 		show_selection (editor.get_selection().time);
 	}
-
-//	for (vector<TimeAxisView*>::iterator i = children.begin(); i != children.end(); ++i) {
-//		(*i)->set_height (h);
-//	}
-
 }
 
 bool
@@ -875,3 +868,7 @@ TimeAxisView::reset_height()
 	}
 }
 	
+void
+TimeAxisView::check_height (Gdk::Rectangle& r)
+{
+}
diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h
index b2e73e876a..e5e13a6c3f 100644
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -75,12 +75,12 @@ class TimeAxisView : public virtual AxisView
 		   valued so that there is a precise
 		   middle.
 		*/
-		Largest = 301,
-		Large = 201,
-		Larger = 101,
-		Normal = 51,
-		Smaller = 31,
-		Small = 21
+		Largest = 307,
+		Large = 207,
+		Larger = 107,
+		Normal = 57,
+		Smaller = 37,
+		Small = 27
 	};
 
 	TimeAxisView(ARDOUR::Session& sess, PublicEditor& ed, TimeAxisView* parent, ArdourCanvas::Canvas& canvas);
@@ -89,7 +89,7 @@ class TimeAxisView : public virtual AxisView
 	/* public data: XXX create accessor/mutators for these ?? */
 
 	PublicEditor& editor;
-
+	
 	guint32 height;  /* in canvas units */
 	guint32 effective_height;  /* in canvas units */
 	double  y_position;
@@ -294,6 +294,8 @@ class TimeAxisView : public virtual AxisView
 	bool _hidden;
 	bool _has_state;
 
+	void check_height (Gdk::Rectangle&);
+
 }; /* class TimeAxisView */
 
 #endif /* __ardour_gtk_time_axis_h__ */