projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TraceView: Use sticky scrolling setting directly
[pulseview.git]
/
pv
/
view
/
view.cpp
diff --git
a/pv/view/view.cpp
b/pv/view/view.cpp
index 2bf3d20a4301413a8503aceb9b9d441698334474..8595594803b58f21b3c33f439e51b69358d149ae 100644
(file)
--- a/
pv/view/view.cpp
+++ b/
pv/view/view.cpp
@@
-562,16
+562,6
@@
pair<Timestamp, Timestamp> View::get_time_extents() const
return make_pair(*left_time, *right_time);
}
return make_pair(*left_time, *right_time);
}
-void View::enable_sticky_scrolling(bool state)
-{
- sticky_scrolling_ = state;
-}
-
-void View::toggle_sticky_scrolling()
-{
- sticky_scrolling_ = !sticky_scrolling_;
-}
-
void View::enable_coloured_bg(bool state)
{
const vector<shared_ptr<TraceTreeItem>> items(
void View::enable_coloured_bg(bool state)
{
const vector<shared_ptr<TraceTreeItem>> items(
@@
-676,7
+666,7
@@
void View::restack_all_trace_tree_items()
o->restack_items();
// Re-assign background colors
o->restack_items();
// Re-assign background colors
- bool next_bgcolour_state =
0
;
+ bool next_bgcolour_state =
false
;
for (auto &o : sorted_owners)
next_bgcolour_state = o->reassign_bgcolour_states(next_bgcolour_state);
for (auto &o : sorted_owners)
next_bgcolour_state = o->reassign_bgcolour_states(next_bgcolour_state);
@@
-1241,6
+1231,9
@@
void View::capture_state_updated(int 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_);
}
+
+ // Enable sticky scrolling if the setting is enabled
+ sticky_scrolling_ = settings.value(GlobalSettings::Key_View_StickyScrolling).toBool();
}
if (state == Session::Stopped) {
}
if (state == Session::Stopped) {