Revert "View: Decouple horizontal scrolling from the scoll bar"

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

diff --git a/pv/view/view.h b/pv/view/view.h
index f196cfe07d9c3bea5d97e7bf972d6aef9008baa0..5a10ee9ecea7be2b9dacd69c6bb964d0a215de23 100644 (file)
--- a/pv/view/view.h
+++ b/pv/view/view.h
@@ -26,6 +26,7 @@
 #include <utility>
 
 #include <QAbstractScrollArea>
+#include <QSizeF>
 
 #include "cursor.h"
 
@@ -53,9 +54,13 @@ private:
 
 public:
        static const int SignalHeight;
+       static const int SignalMargin;
+       static const int SignalSnapGridSize;
 
        static const QColor CursorAreaColour;
 
+       static const QSizeF LabelPadding;
+
 public:
        explicit View(SigSession &session, QWidget *parent = 0);
 
@@ -100,14 +105,20 @@ public:
 
        const QPoint& hover_point() const;
 
+       void normalize_layout();
+
 signals:
        void hover_point_changed();
 
+       void signals_moved();
+
 private:
        void get_scroll_layout(double &length, double &offset) const;
        
        void update_scroll();
 
+       void reset_signal_layout();
+
 private:
        bool eventFilter(QObject *object, QEvent *event);
 
@@ -120,10 +131,13 @@ private slots:
        void h_scroll_value_changed(int value);
        void v_scroll_value_changed(int value);
 
+       void signals_changed();
        void data_updated();
 
        void marker_time_changed();
 
+       void on_signals_moved();
+
 private:
        SigSession &_session;