X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_summary.cc;h=b570cf4e1a0238c1e9d57bf6f2c70106487d84ca;hb=e161bc0596b6cb8facdefc56435553f76ee643c3;hp=85aed8291f66973f794b4f7eac2322485ac996d5;hpb=300d765f176cd7966b12bcd02643bce6063b5fb6;p=ardour.git

diff --git a/gtk2_ardour/editor_summary.cc b/gtk2_ardour/editor_summary.cc
index 85aed8291f..b570cf4e1a 100644
--- a/gtk2_ardour/editor_summary.cc
+++ b/gtk2_ardour/editor_summary.cc
@@ -21,6 +21,7 @@
 
 #include "canvas/debug.h"
 
+#include "ardour_ui.h"
 #include "time_axis_view.h"
 #include "streamview.h"
 #include "editor_summary.h"
@@ -60,6 +61,8 @@ EditorSummary::EditorSummary (Editor* e)
 {
 	add_events (Gdk::POINTER_MOTION_MASK|Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK);
 	set_flags (get_flags() | Gtk::CAN_FOCUS);
+
+	ARDOUR_UI::config()->ParameterChanged.connect (sigc::mem_fun (*this, &EditorSummary::parameter_changed));
 }
 
 EditorSummary::~EditorSummary ()
@@ -67,6 +70,15 @@ EditorSummary::~EditorSummary ()
 	cairo_surface_destroy (_image);
 }
 
+void
+EditorSummary::parameter_changed (string p)
+{
+
+	if (p == "color-regions-using-track-color") {
+		set_background_dirty ();
+	}
+}
+
 /** Handle a size allocation.
  *  @param alloc GTK allocation.
  */
@@ -74,8 +86,7 @@ void
 EditorSummary::on_size_allocate (Gtk::Allocation& alloc)
 {
 	CairoWidget::on_size_allocate (alloc);
-	_background_dirty = true;
-	set_dirty ();
+	set_background_dirty ();
 }
 
 
@@ -166,7 +177,7 @@ EditorSummary::render_background_image ()
 		StreamView* s = (*i)->view ();
 
 		if (s) {
-			cairo_set_line_width (cr, _track_height * 0.6);
+			cairo_set_line_width (cr, _track_height * 0.8);
 
 			s->foreach_regionview (sigc::bind (
 						       sigc::mem_fun (*this, &EditorSummary::render_region),
@@ -231,10 +242,10 @@ EditorSummary::render (cairo_t* cr, cairo_rectangle_t*)
 	int32_t width = _view_rectangle_x.second - _view_rectangle_x.first;
 	int32_t height = _view_rectangle_y.second - _view_rectangle_y.first;
 	cairo_rectangle (cr, _view_rectangle_x.first, _view_rectangle_y.first, width, height); 
-	cairo_set_source_rgba (cr, 1, 1, 1, 0.25);
+	cairo_set_source_rgba (cr, 1, 1, 1, 0.1);
 	cairo_fill_preserve (cr);
 	cairo_set_line_width (cr, 1);
-	cairo_set_source_rgba (cr, 1, 1, 1, 0.5);
+	cairo_set_source_rgba (cr, 1, 1, 1, 0.4);
 	cairo_stroke (cr);
 
 	/* Playhead */
@@ -463,7 +474,7 @@ EditorSummary::on_button_press_event (GdkEventButton* ev)
 bool
 EditorSummary::suspending_editor_updates () const
 {
-	return (!Config->get_update_editor_during_summary_drag () && (_zoom_dragging || _move_dragging));
+	return (!ARDOUR_UI::config()->get_update_editor_during_summary_drag () && (_zoom_dragging || _move_dragging));
 }
 
 /** Fill in x and y with the editor's current viewable area in summary coordinates */
@@ -628,12 +639,16 @@ EditorSummary::on_motion_notify_event (GdkEventMotion* ev)
 			xr.first += dx;
 		} else if (_zoom_position == RIGHT || _zoom_position == RIGHT_TOP || _zoom_position == RIGHT_BOTTOM) {
 			xr.second += dx;
+		} else {
+			xr.first = -1; /* do not change */
 		}
 
 		if (_zoom_position == TOP || _zoom_position == LEFT_TOP || _zoom_position == RIGHT_TOP) {
 			yr.first += dy;
 		} else if (_zoom_position == BOTTOM || _zoom_position == LEFT_BOTTOM || _zoom_position == RIGHT_BOTTOM) {
 			yr.second += dy;
+		} else {
+			yr.first = -1; /* do not change y */
 		}
 
 		set_overlays_dirty ();
@@ -788,8 +803,12 @@ EditorSummary::set_editor (pair<double,double> const x, pair<double, double> con
 		return;
 	}
 
-	set_editor_x (x);
-	set_editor_y (y);
+	if (x.first >= 0) {
+		set_editor_x (x);
+	}
+	if (y.first >= 0) {
+		set_editor_y (y);
+	}
 }
 
 /** Set the left of the x range visible in the editor.
@@ -893,7 +912,7 @@ EditorSummary::set_editor_y (pair<double, double> const y)
 		set_dirty ();
 		return;
 	}
-	
+
 	/* Compute current height of tracks between y.first and y.second.  We add up
 	   the total height into `total_height' and the height of complete tracks into
 	   `scale height'.
@@ -935,7 +954,7 @@ EditorSummary::set_editor_y (pair<double, double> const y)
 	/* Height that we will use for scaling; use the whole editor height unless there are not
 	   enough tracks to fill it.
 	*/
-	double const ch = min (total_height, _editor->visible_canvas_height());
+	double const ch = min (total_height, (_editor->visible_canvas_height() - _editor->get_trackview_group()->canvas_origin().y));
 
 	/* hence required scale factor of the complete tracks to fit the required y range;
 	   the amount of space they should take up divided by the amount they currently take up.
@@ -953,7 +972,7 @@ EditorSummary::set_editor_y (pair<double, double> const y)
 		}
 
 		if (yc.first <= 0 && yc.second >= _track_height) {
-			(*i)->set_height (max (TimeAxisView::preset_height (HeightSmall), (uint32_t) ((*i)->effective_height() * scale)));
+			(*i)->set_height (max (TimeAxisView::preset_height (HeightSmall), (uint32_t) ((*i)->effective_height() * scale)), TimeAxisView::TotalHeight);
 		}
 
 		yc.first -= _track_height;
@@ -1035,16 +1054,14 @@ EditorSummary::routes_added (list<RouteTimeAxisView*> const & r)
 		}
 	}
 
-	_background_dirty = true;
-	set_dirty ();
+	set_background_dirty ();
 }
 
 void
 EditorSummary::route_gui_changed (string c)
 {
 	if (c == "color") {
-		_background_dirty = true;
-		set_dirty ();
+		set_background_dirty ();
 	}
 }