Moved RulerHeight out of View into Ruler

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index bf1507a7fab31d0117e67ec4d18e50db8a0bbab0..8d7569e35b427769c191b76d0b50c009116ea156 100644 (file)
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -43,6 +43,7 @@ using namespace std;
 namespace pv {
 namespace view {
 
+const int Ruler::RulerHeight = 30;
 const int Ruler::MinorTickSubdivision = 4;
 const int Ruler::ScaleUnits[3] = {1, 2, 5};
 
@@ -84,6 +85,11 @@ QString Ruler::format_time(double t, unsigned int prefix,
        return s;
 }
 
+QSize Ruler::sizeHint() const
+{
+       return QSize(0, RulerHeight);
+}
+
 void Ruler::paintEvent(QPaintEvent*)
 {
        using namespace Qt;

diff --git a/pv/view/ruler.h b/pv/view/ruler.h
index 6f77cb4d9aa89e9f7463966bc92227a26f1b2f08..dc4e7bb73139530cf870dacb5f06010e7c432050 100644 (file)
--- a/pv/view/ruler.h
+++ b/pv/view/ruler.h
@@ -36,6 +36,7 @@ class Ruler : public MarginWidget
        Q_OBJECT
 
 private:
+       static const int RulerHeight;
        static const int MinorTickSubdivision;
        static const int ScaleUnits[3];
 
@@ -52,6 +53,9 @@ public:
        static QString format_time(double t, unsigned int prefix,
                unsigned precision = 0);
 
+public:
+       QSize sizeHint() const;
+
 private:
        void paintEvent(QPaintEvent *event);
 

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index c2d97f070a83bb46c1d6b389bbd628048c5064b3..f5f626b38a4be15bffaa84b13a187f8758dffdfb 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -52,8 +52,6 @@ namespace view {
 const double View::MaxScale = 1e9;
 const double View::MinScale = 1e-15;
 
-const int View::RulerHeight = 30;
-
 const int View::MaxScrollValue = INT_MAX / 2;
 
 const int View::SignalHeight = 30;
@@ -383,7 +381,8 @@ void View::update_scroll()
 
 void View::update_layout()
 {
-       setViewportMargins(_header->sizeHint().width(), RulerHeight, 0, 0);
+       setViewportMargins(_header->sizeHint().width(),
+               _ruler->sizeHint().height(), 0, 0);
        _ruler->setGeometry(_viewport->x(), 0,
                _viewport->width(), _viewport->y());
        _header->setGeometry(0, _viewport->y(),
@@ -480,7 +479,7 @@ void View::signals_changed()
                offset += SignalHeight + 2 * SignalMargin;
        }
 
-       setViewportMargins(_header->sizeHint().width(), RulerHeight, 0, 0);
+       update_layout();
        normalize_layout();
 }
 

diff --git a/pv/view/view.h b/pv/view/view.h
index 886aa8302adc4259e44b04d43aec6b3d7e8689cc..6f1e87288bd1dd14f40568f86198ea39f0a3a7bc 100644 (file)
--- a/pv/view/view.h
+++ b/pv/view/view.h
@@ -51,8 +51,6 @@ private:
        static const double MaxScale;
        static const double MinScale;
 
-       static const int RulerHeight;
-
        static const int MaxScrollValue;
 
 public: