DecodeTrace: Try to keep annotation labels within the view

[pulseview.git] / pv / view / decodetrace.hpp

diff --git a/pv/view/decodetrace.hpp b/pv/view/decodetrace.hpp
index 954ac90ca420e84c8bd596a95607fbaf960995c9..af9151810100f1cf5eadea7dc3f58d60725d3bb5 100644 (file)
--- a/pv/view/decodetrace.hpp
+++ b/pv/view/decodetrace.hpp
@@ -134,15 +134,14 @@ private:
                size_t base_colour) const;
 
        void draw_annotation_block(std::vector<pv::data::decode::Annotation> a,
-               QPainter &p, int h, const ViewItemPaintParams &pp, int y,
-               size_t base_colour) const;
+               QPainter &p, int h, int y, size_t base_colour) const;
 
        void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
                QColor fill, QColor outline, int h, double x, int y) const;
 
        void draw_range(const pv::data::decode::Annotation &a, QPainter &p,
                QColor fill, QColor outline, int h, double start,
-               double end, int y) const;
+               double end, int y, const ViewItemPaintParams &pp) const;
 
        void draw_error(QPainter &p, const QString &message,
                const ViewItemPaintParams &pp);
@@ -207,7 +206,7 @@ private:
        std::vector<pv::widgets::DecoderGroupBox*> decoder_forms_;
 
        std::vector<data::decode::Row> visible_rows_;
-       int row_height_;
+       int row_height_, max_visible_rows_;
 
        QSignalMapper delete_mapper_, show_hide_mapper_;
 };