X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fview.hpp;h=7fef8419e625232b7013eb4e4e84a7bbcae60af0;hp=63bafbfeac958f745241a6dbbb7678ae28ebd42c;hb=HEAD;hpb=8845be3c9c7d5aca02fb2efc4038f4735a5242d6

diff --git a/pv/views/trace/view.hpp b/pv/views/trace/view.hpp
index 63bafbfe..7fef8419 100644
--- a/pv/views/trace/view.hpp
+++ b/pv/views/trace/view.hpp
@@ -393,9 +393,7 @@ private:
 	void adjust_top_margin();
 
 	void update_scroll();
-
 	void reset_scroll();
-
 	void set_scroll_default();
 
 	void determine_if_header_was_shrunk();
@@ -422,6 +420,7 @@ private:
 
 	void resizeEvent(QResizeEvent *event);
 
+	void update_view_range_metaobject() const;
 	void update_hover_point();
 
 public:
@@ -453,6 +452,8 @@ private Q_SLOTS:
 
 	void on_settingViewTriggerIsZeroTime_changed(const QVariant new_value);
 
+	void on_create_marker_here();
+
 	virtual void perform_delayed_view_update();
 
 	void process_sticky_events();
@@ -536,7 +537,7 @@ private:
 	bool custom_zero_offset_set_;
 
 	bool updating_scroll_;
-	bool settings_restored_;
+	bool restoring_state_;
 	bool header_was_shrunk_;
 
 	bool sticky_scrolling_;
@@ -569,18 +570,15 @@ private:
 	// This is true when the defaults couldn't be set due to insufficient info
 	bool scroll_needs_defaults_;
 
-	// A nonzero value indicates the v offset to restore. See View::resizeEvent()
+	// The v offset to restore. See View::eventFilter()
 	int saved_v_offset_;
 
 	// These are used to determine whether the view was altered after acq started
 	double scale_at_acq_start_;
 	pv::util::Timestamp offset_at_acq_start_;
 
-	// Used to suppress performing a "zoom to fit" when the session stops. This
-	// is needed when the view's settings are restored before acquisition ends.
-	// In that case we want to keep the restored settings, not have a "zoom to fit"
-	// mess them up.
-	bool suppress_zoom_to_fit_after_acq_;
+	// X coordinate of mouse cursor where the user clicked to open a context menu
+	uint32_t context_menu_x_pos_;
 };
 
 } // namespace trace