Bring back sticky scroll and coloured background shortcuts.

[pulseview.git] / pv / view / view.cpp

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 08dc8828357d0e704a45dc6782411024968a7381..e8774f332b235dfa20222c4cd5da09202a0b1371 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -145,6 +145,7 @@ View::View(Session &session, QWidget *parent) :
        offset_(0),
        updating_scroll_(false),
        sticky_scrolling_(false), // Default setting is set in MainWindow::setup_ui()
+       coloured_bg_(false),
        always_zoom_to_fit_(false),
        tick_period_(0),
        tick_prefix_(pv::util::SIPrefix::yocto),
@@ -563,11 +564,23 @@ void View::enable_sticky_scrolling(bool state)
        sticky_scrolling_ = state;
 }
 
+void View::toggle_sticky_scrolling(void)
+{
+       sticky_scrolling_ = !sticky_scrolling_;
+}
+
+bool View::get_coloured_bg(void)
+{
+       return coloured_bg_;
+}
+
 void View::enable_coloured_bg(bool state)
 {
        const vector<shared_ptr<TraceTreeItem>> items(
                list_by_type<TraceTreeItem>());
 
+       coloured_bg_ = state;
+
        for (shared_ptr<TraceTreeItem> i : items) {
                // Can't cast to Trace because it's abstract, so we need to
                // check for any derived classes individually
@@ -590,6 +603,11 @@ void View::enable_coloured_bg(bool state)
        viewport_->update();
 }
 
+void View::toggle_coloured_bg(void)
+{
+       enable_coloured_bg(!coloured_bg_);
+}
+
 bool View::cursors_shown() const
 {
        return show_cursors_;
@@ -827,15 +845,6 @@ void View::set_scroll_default()
 
        const QSize areaSize = viewport_->size();
 
-       // Special case: when starting up and the window isn't visible yet,
-       // areaSize is [0, 0]. In this case we want to be called again later
-       if ((areaSize.height() == 0) || (!size_finalized_)) {
-               scroll_needs_defaults_ = true;
-               return;
-       } else {
-               scroll_needs_defaults_ = false;
-       }
-
        const pair<int, int> extents = v_extents();
        const int trace_height = extents.second - extents.first;
 
@@ -847,6 +856,11 @@ void View::set_scroll_default()
        else
                // Put the first trace at the top, letting the bottom ones overflow
                set_v_offset(extents.first);
+
+       // If we're not sure whether setting the defaults worked as
+       // the window wasn't set up entirely yet, we want to be called
+       // again later to make sure
+       scroll_needs_defaults_ = !size_finalized_;
 }
 
 void View::update_layout()
@@ -1196,11 +1210,11 @@ void View::signals_changed()
                }
 
        // Add and position the pending top levels items
+       int offset = v_extents().second;
        for (auto item : new_top_level_items) {
                add_child_item(item);
 
                // Position the item after the last item or at the top if there is none
-               int offset = v_extents().second;
                const pair<int, int> extents = item->v_extents();
 
                if (item->enabled())