X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fview.h;h=eb60ab1a7735d9f3e51e2f96f00928fa5445b4da;hb=7ff0145fbf19de010232ea5edadea5df6c28ed8e;hp=5fbc0adef7eb463317ef2e14cba17c00bf2898e0;hpb=eae6e30af53f6b3e42dc5be212c82870078276b0;p=pulseview.git

diff --git a/pv/view/view.h b/pv/view/view.h
index 5fbc0ad..eb60ab1 100644
--- a/pv/view/view.h
+++ b/pv/view/view.h
@@ -29,6 +29,7 @@
 
 #include <QAbstractScrollArea>
 #include <QSizeF>
+#include <QTimer>
 
 #include <pv/data/signaldata.h>
 
@@ -49,6 +50,12 @@ class Viewport;
 class View : public QAbstractScrollArea, public RowItemOwner {
 	Q_OBJECT
 
+private:
+	enum StickyEvents {
+		SelectableItemHExtentsChanged = 1,
+		SelectableItemVExtentsChanged = 2
+	};
+
 private:
 	static const double MaxScale;
 	static const double MinScale;
@@ -56,10 +63,6 @@ private:
 	static const int MaxScrollValue;
 
 public:
-	static const int SignalHeight;
-	static const int SignalMargin;
-	static const int SignalSnapGridSize;
-
 	static const QColor CursorAreaColour;
 
 	static const QSizeF LabelPadding;
@@ -94,7 +97,12 @@ public:
 	 * seconds.
 	 */
 	double offset() const;
-	int owner_v_offset() const;
+	int owner_visual_v_offset() const;
+
+	/**
+	 * Returns the number of nested parents that this row item owner has.
+	 */
+	unsigned int depth() const;
 
 	void zoom(double steps);
 	void zoom(double steps, int offset);
@@ -110,13 +118,6 @@ public:
 	 */
 	void set_scale_offset(double scale, double offset);
 
-	/**
-	 * Returns a list of traces owned by this object.
-	 */
-	std::vector< std::shared_ptr<RowItem> > child_items() const;
-
-	std::list<std::weak_ptr<SelectableItem> > selected_items() const;
-
 	std::set< std::shared_ptr<pv::data::SignalData> >
 		get_visible_data() const;
 
@@ -149,10 +150,10 @@ public:
 
 	const QPoint& hover_point() const;
 
-	void normalize_layout();
-
 	void update_viewport();
 
+	void restack_all_row_items();
+
 Q_SIGNALS:
 	void hover_point_changed();
 
@@ -201,6 +202,11 @@ private:
 
 	void resizeEvent(QResizeEvent *e);
 
+public:
+	void appearance_changed(bool label, bool content);
+
+	void extents_changed(bool horz, bool vert);
+
 private Q_SLOTS:
 
 	void h_scroll_value_changed(int value);
@@ -213,7 +219,7 @@ private Q_SLOTS:
 
 	void on_signals_moved();
 
-	void on_geometry_updated();
+	void process_sticky_events();
 
 	void on_hover_point_changed();
 
@@ -238,6 +244,9 @@ private:
 	CursorPair _cursors;
 
 	QPoint _hover_point;
+
+	unsigned int _sticky_events;
+	QTimer _lazy_event_handler;
 };
 
 } // namespace view