Partial fix to scroll overflow issues

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

diff --git a/pv/view/view.h b/pv/view/view.h
index b7769899b7a09bf9d52988b4c469ed473be9fcca..07e67f27547ad959e8ccb3912512d45d659e327f 100644 (file)
--- a/pv/view/view.h
+++ b/pv/view/view.h
@@ -30,6 +30,8 @@ class SigSession;
 namespace pv {
 namespace view {
 
+class Header;
+class Ruler;
 class Viewport;
 
 class View : public QAbstractScrollArea {
@@ -42,6 +44,11 @@ private:
        static const int LabelMarginWidth;
        static const int RulerHeight;
 
+       static const int MaxScrollValue;
+
+public:
+       static const int SignalHeight;
+
 public:
        explicit View(SigSession &session, QWidget *parent = 0);
 
@@ -52,14 +59,15 @@ public:
        int v_offset() const;
 
        void zoom(double steps);
+       void zoom(double steps, int offset);
 
        void set_scale_offset(double scale, double offset);
 
 private:
+       void get_scroll_layout(double &length, double &offset) const;
+       
        void update_scroll();
 
-       void zoom(double steps, int offset);
-
 private:
        bool viewportEvent(QEvent *e);
 
@@ -75,6 +83,8 @@ private:
        SigSession &_session;
 
        Viewport *_viewport;
+       Ruler *_ruler;
+       Header *_header;
 
        uint64_t _data_length;
 
@@ -82,8 +92,6 @@ private:
        double _offset;
 
        int _v_offset;
-
-       friend class Viewport;
 };
 
 } // namespace view