projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Settings: Allow user to choose the Qt UI style
[pulseview.git]
/
pv
/
views
/
trace
/
view.cpp
diff --git
a/pv/views/trace/view.cpp
b/pv/views/trace/view.cpp
index f1d7aa3dfca872a29bc81f5c0c2c444e4a34e03e..79277b4e17074708b0f1e3718ef6eeb4996d2c93 100644
(file)
--- a/
pv/views/trace/view.cpp
+++ b/
pv/views/trace/view.cpp
@@
-495,9
+495,12
@@
const Timestamp& View::ruler_offset() const
return ruler_offset_;
}
return ruler_offset_;
}
-void View::set_zero_position(pv::util::Timestamp& position)
+void View::set_zero_position(
const
pv::util::Timestamp& position)
{
{
- ruler_shift_ = -position;
+ // ruler shift is a negative offset and the new zero position is relative
+ // to the current offset. Hence, we adjust the ruler shift only by the
+ // difference.
+ ruler_shift_ = -(position + (-ruler_shift_));
// Force an immediate update of the offsets
set_offset(offset_, true);
// Force an immediate update of the offsets
set_offset(offset_, true);
@@
-1215,7
+1218,8
@@
void View::set_scroll_default()
void View::determine_if_header_was_shrunk()
{
void View::determine_if_header_was_shrunk()
{
- const int header_pane_width = splitter_->sizes().front();
+ const int header_pane_width =
+ splitter_->sizes().front(); // clazy:exclude=detaching-temporary
// Allow for a slight margin of error so that we also accept
// slight differences when e.g. a label name change increased
// Allow for a slight margin of error so that we also accept
// slight differences when e.g. a label name change increased
@@
-1234,7
+1238,7
@@
void View::resize_header_to_fit()
// splitter to the maximum allowed position.
int splitter_area_width = 0;
// splitter to the maximum allowed position.
int splitter_area_width = 0;
- for (int w : splitter_->sizes())
+ for (int w : splitter_->sizes())
// clazy:exclude=range-loop
splitter_area_width += w;
// Make sure the header has enough horizontal space to show all labels fully
splitter_area_width += w;
// Make sure the header has enough horizontal space to show all labels fully