X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fview.hpp;h=bf8b64325feef171b3c7fb17b01dff461985284f;hb=6381b375ae391a79ab50f1f5dcbe0014ff9bd46c;hp=040bac1b828590514fe22937041f050a3b426aef;hpb=95a4b2a131d6995d08f2eb6dded50f928d1ecb1e;p=pulseview.git

diff --git a/pv/views/trace/view.hpp b/pv/views/trace/view.hpp
index 040bac1b..bf8b6432 100644
--- a/pv/views/trace/view.hpp
+++ b/pv/views/trace/view.hpp
@@ -96,6 +96,7 @@ private:
 	static const pv::util::Timestamp MinScale;
 
 	static const int MaxScrollValue;
+	static const int ViewScrollMargin;
 
 	static const int ScaleUnits[3];
 
@@ -271,7 +272,7 @@ public:
 	bool colored_bg() const;
 
 	/**
-	 * Returns true if cursors are displayed. false otherwise.
+	 * Returns true if cursors are displayed, false otherwise.
 	 */
 	bool cursors_shown() const;
 
@@ -281,14 +282,16 @@ public:
 	void show_cursors(bool show = true);
 
 	/**
-	 * Sets the cursors to the given offsets. You will still have to call show_cursors separately.
+	 * Sets the cursors to the given offsets.
+	 * You still have to call show_cursors() separately.
 	 */
 	void set_cursors(pv::util::Timestamp& first, pv::util::Timestamp& second);
 
 	/**
 	 * Moves the cursors to a convenient position in the view.
+	 * You still have to call show_cursors() separately.
 	 */
-	void centre_cursors();
+	void center_cursors();
 
 	/**
 	 * Returns a reference to the pair of cursors.
@@ -528,6 +531,8 @@ private:
 	pv::util::Timestamp ruler_offset_;
 	/// The offset of the zero point in seconds.
 	pv::util::Timestamp zero_offset_;
+	/// Shows whether the user set a custom zero offset that we should keep
+	bool custom_zero_offset_set_;
 
 	bool updating_scroll_;
 	bool settings_restored_;