TraceView: Use sticky scrolling setting directly

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

diff --git a/pv/view/view.hpp b/pv/view/view.hpp
index 2f5d7020f05011c70594589ca95c4d50bae2bb65..1d63417cb89ab520dd7c43e07cfaf72f3b6240fd 100644 (file)
--- a/pv/view/view.hpp
+++ b/pv/view/view.hpp
@@ -89,7 +89,7 @@ private:
        static const int ScaleUnits[3];
 
 public:
-       explicit View(Session &session, QWidget *parent = 0);
+       explicit View(Session &session, bool is_main_view=false, QWidget *parent = 0);
 
        Session& session();
        const Session& session() const;
@@ -199,12 +199,6 @@ public:
 
        std::pair<pv::util::Timestamp, pv::util::Timestamp> get_time_extents() const;
 
-       /**
-        * Enables or disables sticky scrolling, i.e. the view always shows
-        * the most recent samples when capturing data.
-        */
-       void enable_sticky_scrolling(bool state);
-
        /**
         * Enables or disables coloured trace backgrounds. If they're not
         * coloured then they will use alternating colors.
@@ -401,6 +395,7 @@ private:
 
        bool updating_scroll_;
        bool sticky_scrolling_;
+       bool coloured_bg_;
        bool always_zoom_to_fit_;
        QTimer delayed_view_updater_;
 
@@ -423,7 +418,12 @@ private:
        QTimer lazy_event_handler_;
 
        // This is true when the defaults couldn't be set due to insufficient info
-       bool scroll_needs_defaults;
+       bool scroll_needs_defaults_;
+
+       // A nonzero value indicates the v offset to restore. See View::resizeEvent()
+       int saved_v_offset_;
+
+       bool size_finalized_;
 };
 
 } // namespace TraceView