projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
143d322
)
TraceView: Only perform "always zoom to fit" for the main view
author
Soeren Apel
<soeren@apelpie.net>
Sun, 5 Mar 2017 20:16:56 +0000
(21:16 +0100)
committer
Uwe Hermann
<uwe@hermann-uwe.de>
Tue, 7 Mar 2017 21:59:36 +0000
(22:59 +0100)
pv/view/view.cpp
patch
|
blob
|
history
diff --git
a/pv/view/view.cpp
b/pv/view/view.cpp
index 9ca973a7ea9ca3b4227cde8973f2add6f284348a..04bb99205636fd50ffe18872f56dd3ba2dcd3bb5 100644
(file)
--- a/
pv/view/view.cpp
+++ b/
pv/view/view.cpp
@@
-1233,10
+1233,12
@@
void View::capture_state_updated(int state)
trigger_markers_.clear();
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();
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_);
}
always_zoom_to_fit_ = true;
always_zoom_to_fit_changed(always_zoom_to_fit_);
}