Handle changed session duration & resizing canvas better wrt end marker, remove unused last_canvas_frame, don't redraw the entire mixer every time its presented, consistent space between rightmost horizontal scroller position and end marker when zooming.

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3981 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 12 insertions, 11 deletions

diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index 5353b73571..a24f7046b0 100644
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -240,18 +240,19 @@ void
 Mixer_UI::show_window ()
 {
 	show_all ();
+	if (!_visible) {
+		set_window_pos_and_size ();
 
-	set_window_pos_and_size ();
-
-	/* now reset each strips width so the right widgets are shown */
-	MixerStrip* ms;
-
-	TreeModel::Children rows = track_model->children();
-	TreeModel::Children::iterator ri;
-
-	for (ri = rows.begin(); ri != rows.end(); ++ri) {
-		ms = (*ri)[track_columns.strip];
-		ms->set_width (ms->get_width(), ms->width_owner());
+		/* now reset each strips width so the right widgets are shown */
+		MixerStrip* ms;
+		
+		TreeModel::Children rows = track_model->children();
+		TreeModel::Children::iterator ri;
+		
+		for (ri = rows.begin(); ri != rows.end(); ++ri) {
+			ms = (*ri)[track_columns.strip];
+			ms->set_width (ms->get_width(), ms->width_owner());
+		}
 	}
 	_visible = true;
 }