projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
820ce18
)
TraceView: Fix "always zoom to fit" feature
author
Soeren Apel
<soeren@apelpie.net>
Mon, 6 Mar 2017 18:07:36 +0000
(19:07 +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 04bb99205636fd50ffe18872f56dd3ba2dcd3bb5..23de2087c94120e030834c9e1dfb0e8ec6312952 100644
(file)
--- a/
pv/view/view.cpp
+++ b/
pv/view/view.cpp
@@
-1251,6
+1251,8
@@
void View::capture_state_updated(int state)
// Reset "always zoom to fit", the acquisition has stopped
if (always_zoom_to_fit_) {
// 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_);
}
always_zoom_to_fit_ = false;
always_zoom_to_fit_changed(always_zoom_to_fit_);
}
@@
-1272,10
+1274,9
@@
void View::data_updated()
void View::perform_delayed_view_update()
{
void View::perform_delayed_view_update()
{
- if (always_zoom_to_fit_)
+ if (always_zoom_to_fit_)
{
zoom_fit(true);
zoom_fit(true);
-
- if (sticky_scrolling_) {
+ } else if (sticky_scrolling_) {
// Make right side of the view sticky
double length = 0;
Timestamp offset;
// Make right side of the view sticky
double length = 0;
Timestamp offset;