X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Fruler.h;h=dc4e7bb73139530cf870dacb5f06010e7c432050;hb=8bd26d8b9c831b509ee3241ea4dac6f50c023622;hp=689b073cede32e81af7e43e901057c2c93e515bf;hpb=332afa7438aa5532599fe65f9092e1b24b34fe04;p=pulseview.git

diff --git a/pv/view/ruler.h b/pv/view/ruler.h
index 689b073c..dc4e7bb7 100644
--- a/pv/view/ruler.h
+++ b/pv/view/ruler.h
@@ -21,7 +21,9 @@
 #ifndef PULSEVIEW_PV_VIEW_RULER_H
 #define PULSEVIEW_PV_VIEW_RULER_H
 
-#include <QWidget>
+#include <boost/weak_ptr.hpp>
+
+#include "marginwidget.h"
 
 namespace pv {
 namespace view {
@@ -29,11 +31,12 @@ namespace view {
 class TimeMarker;
 class View;
 
-class Ruler : public QWidget
+class Ruler : public MarginWidget
 {
 	Q_OBJECT
 
 private:
+	static const int RulerHeight;
 	static const int MinorTickSubdivision;
 	static const int ScaleUnits[3];
 
@@ -45,9 +48,14 @@ private:
 public:
 	Ruler(View &parent);
 
+	void clear_selection();
+
 	static QString format_time(double t, unsigned int prefix,
 		unsigned precision = 0);
 
+public:
+	QSize sizeHint() const;
+
 private:
 	void paintEvent(QPaintEvent *event);
 
@@ -65,9 +73,9 @@ private slots:
 	void hover_point_changed();
 
 private:
-	View &_view;
-
-	TimeMarker *_grabbed_marker;
+	boost::weak_ptr<TimeMarker> _grabbed_marker;
+	QPoint _mouse_down_point;
+	bool _dragging;
 };
 
 } // namespace view