fix crashing bug on cut operation; panner noodling

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

5 files changed, 10 insertions, 18 deletions

diff --git a/gtk2_ardour/ardour2_ui.rc b/gtk2_ardour/ardour2_ui.rc
index 074e75c0bc..771210829d 100644
--- a/gtk2_ardour/ardour2_ui.rc
+++ b/gtk2_ardour/ardour2_ui.rc
@@ -971,11 +971,11 @@ style "pan_slider"
 
 	# used to draw the triangular indicators 
 
-	base[NORMAL] = { 0.803, 0.792, 0.619 }
-	base[ACTIVE] =  { 0.803, 0.792, 0.619 }
+	base[NORMAL] = { 0.80, 0.80, 0.80 }
+	base[ACTIVE] =  { 0.80, 0.80, 0.80 }
 	base[INSENSITIVE] = {0.32, 0.39, 0.45 } # matches default_base
-	base[SELECTED] = { 0.803, 0.792, 0.619 }
-	base[PRELIGHT] = { 0.803, 0.792, 0.619 }
+	base[SELECTED] = { 0.80, 0.80, 0.80 }
+	base[PRELIGHT] = { 0.80, 0.80, 0.80 }
 
 }
 
diff --git a/gtk2_ardour/panner.cc b/gtk2_ardour/panner.cc
index 49bdf778e4..89f86b3337 100644
--- a/gtk2_ardour/panner.cc
+++ b/gtk2_ardour/panner.cc
@@ -52,20 +52,20 @@ PannerBar::expose (GdkEventExpose* ev)
 
 	// center
 
-	points[0].x = darea.get_width()/2 - (triangle_size - 2);
+	points[0].x = (darea.get_width()/2 - (triangle_size/2)) - 1;
 	points[0].y = 0;
 
-	points[1].x = darea.get_width()/2 + (triangle_size - 2);
+	points[1].x = (darea.get_width()/2 + (triangle_size/2)) - 1;
 	points[1].y = 0;
 	
 	points[2].x = darea.get_width()/2 - 1;
-	points[2].y = triangle_size - 3;
+	points[2].y = triangle_size - 1;
 
 	gdk_draw_polygon (win->gobj(), gc->gobj(), true, points, 3); 
 
 	// right
 
-	points[0].x = darea.get_width() - triangle_size;
+	points[0].x = (darea.get_width() - triangle_size) - 1;
 	points[0].y = 0;
 
 	points[1].x = darea.get_width();
@@ -116,9 +116,3 @@ PannerBar::button_release (GdkEventButton* ev)
 	return BarController::button_release (ev);
 }
 
-void
-PannerBar::on_size_request (Gtk::Requisition* req)
-{
-	req->width = -1;
-	req->height = 50;
-}
diff --git a/gtk2_ardour/panner.h b/gtk2_ardour/panner.h
index 580d8e9c67..d06a4c21e3 100644
--- a/gtk2_ardour/panner.h
+++ b/gtk2_ardour/panner.h
@@ -9,8 +9,6 @@ class PannerBar : public Gtkmm2ext::BarController
 	PannerBar (Gtk::Adjustment& adj, PBD::Controllable&);
 	~PannerBar ();
 
-	void on_size_request (Gtk::Requisition*);
-
   protected:
 	bool expose (GdkEventExpose*);
 	bool button_press (GdkEventButton*);
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 87f5e8e7cc..67a86b385f 100644
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -1181,7 +1181,6 @@ RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
 
 	playlist = ds->playlist();
 
-
 	TimeSelection time (selection.time);
 	float speed = ds->speed();
 	if (speed != 1.0f) {
diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index 2909fa46e9..36bf40ae36 100644
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -761,8 +761,9 @@ TimeAxisView::get_selection_rect (uint32_t id)
 
 	for (list<SelectionRect*>::iterator i = free_selection_rects.begin(); i != free_selection_rects.end(); ++i) {
 		if ((*i)->id == id) {
+			SelectionRect* ret = (*i);
 			free_selection_rects.erase (i);
-			return (*i);
+			return ret;
 		}
 	}