Added pv::view::MarginWidget as a common base class of Header and Ruler

[pulseview.git] / pv / view / header.h

diff --git a/pv/view/header.h b/pv/view/header.h
index ff058863c2d536a598b5b83a199801bd2ba9b1e5..504011b6a63a348763be0495c9f5b305b4339c66 100644 (file)
--- a/pv/view/header.h
+++ b/pv/view/header.h
@@ -22,10 +22,12 @@
 #define PULSEVIEW_PV_VIEW_HEADER_H
 
 #include <boost/shared_ptr.hpp>
+#include <boost/weak_ptr.hpp>
 
-#include <map>
+#include <list>
+#include <utility>
 
-#include <QWidget>
+#include "marginwidget.h"
 
 namespace pv {
 namespace view {
@@ -33,7 +35,7 @@ namespace view {
 class Signal;
 class View;
 
-class Header : public QWidget
+class Header : public MarginWidget
 {
        Q_OBJECT
 
@@ -63,16 +65,17 @@ private slots:
 
        void on_action_set_colour_triggered();
 
+       void on_signals_moved();
+
 signals:
        void signals_moved();
 
 private:
-       View &_view;
-
        QPoint _mouse_point;
        QPoint _mouse_down_point;
 
-       std::map<const Signal*, int> _mouse_down_signal_offsets;
+       std::list<std::pair<boost::weak_ptr<Signal>, int> >
+               _drag_sigs;
 
        boost::shared_ptr<Signal> _context_signal;
        QAction *_action_set_name;