X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=2bf3d20a4301413a8503aceb9b9d441698334474;hp=9ca973a7ea9ca3b4227cde8973f2add6f284348a;hb=1887da2169397774c9563e9bf44c51ed7efc3646;hpb=143d322d0c92ea5c2cc51facc37b68787362c244

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 9ca973a7..2bf3d20a 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -567,7 +567,7 @@ void View::enable_sticky_scrolling(bool state)
 	sticky_scrolling_ = state;
 }
 
-void View::toggle_sticky_scrolling(void)
+void View::toggle_sticky_scrolling()
 {
 	sticky_scrolling_ = !sticky_scrolling_;
 }
@@ -627,8 +627,8 @@ std::shared_ptr<CursorPair> View::cursors() const
 
 void View::add_flag(const Timestamp& time)
 {
-	flags_.push_back(shared_ptr<Flag>(new Flag(*this, time,
-		QString("%1").arg(next_flag_text_))));
+	flags_.push_back(make_shared<Flag>(*this, time,
+		QString("%1").arg(next_flag_text_)));
 
 	next_flag_text_ = (next_flag_text_ >= 'Z') ? 'A' :
 		(next_flag_text_ + 1);
@@ -688,8 +688,7 @@ void View::restack_all_trace_tree_items()
 
 void View::trigger_event(util::Timestamp location)
 {
-	trigger_markers_.push_back(shared_ptr<TriggerMarker>(
-		new TriggerMarker(*this, location)));
+	trigger_markers_.push_back(make_shared<TriggerMarker>(*this, location));
 }
 
 void View::get_scroll_layout(double &length, Timestamp &offset) const
@@ -1233,10 +1232,12 @@ void View::capture_state_updated(int state)
 
 		trigger_markers_.clear();
 
-		// Activate "always zoom to fit" if the setting is enabled
+		// Activate "always zoom to fit" if the setting is enabled and we're
+		// the main view of this session (other trace views may be used for
+		// zooming and we don't want to mess them up)
 		GlobalSettings settings;
 		bool state = settings.value(GlobalSettings::Key_View_AlwaysZoomToFit).toBool();
-		if (state) {
+		if (is_main_view_ && state) {
 			always_zoom_to_fit_ = true;
 			always_zoom_to_fit_changed(always_zoom_to_fit_);
 		}
@@ -1249,6 +1250,8 @@ void View::capture_state_updated(int state)
 
 		// Reset "always zoom to fit", the acquisition has stopped
 		if (always_zoom_to_fit_) {
+			// Perform a final zoom-to-fit before disabling
+			zoom_fit(always_zoom_to_fit_);
 			always_zoom_to_fit_ = false;
 			always_zoom_to_fit_changed(always_zoom_to_fit_);
 		}
@@ -1270,10 +1273,9 @@ void View::data_updated()
 
 void View::perform_delayed_view_update()
 {
-	if (always_zoom_to_fit_)
+	if (always_zoom_to_fit_) {
 		zoom_fit(true);
-
-	if (sticky_scrolling_) {
+	} else if (sticky_scrolling_) {
 		// Make right side of the view sticky
 		double length = 0;
 		Timestamp offset;