X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.hpp;h=76a38f16630b672cdd2a5ba1ebcc2378ca363277;hp=8ef8812cf5443aaaf1553343eeda27df6b77073b;hb=76750c410e299f9ba9f0f9d1e220713861cc67b6;hpb=8a5fd81fea577663e8c0f17e53d5928599d0926d diff --git a/pv/view/view.hpp b/pv/view/view.hpp index 8ef8812c..76a38f16 100644 --- a/pv/view/view.hpp +++ b/pv/view/view.hpp @@ -29,6 +29,7 @@ #include #include +#include #include #include @@ -70,13 +71,12 @@ class Trace; class Viewport; class TriggerMarker; -class CustomAbstractScrollArea : public QAbstractScrollArea +class CustomScrollArea : public QAbstractScrollArea { Q_OBJECT public: - CustomAbstractScrollArea(QWidget *parent = nullptr); - void setViewportMargins(int left, int top, int right, int bottom); + CustomScrollArea(QWidget *parent = nullptr); bool viewportEvent(QEvent *event); }; @@ -323,6 +323,10 @@ private: void set_scroll_default(); + bool header_was_shrunk() const; + + void expand_header_to_fit(); + void update_layout(); TraceTreeItemOwner* find_prevalent_trace_group( @@ -351,6 +355,7 @@ public: private Q_SLOTS: + void on_splitter_moved(); void h_scroll_value_changed(int value); void v_scroll_value_changed(); @@ -400,9 +405,11 @@ private Q_SLOTS: void set_time_unit(pv::util::TimeUnit time_unit); private: + CustomScrollArea *scrollarea_; Viewport *viewport_; Ruler *ruler_; Header *header_; + QSplitter *splitter_; unordered_set< shared_ptr > signals_; @@ -410,8 +417,6 @@ private: vector< shared_ptr > decode_traces_; #endif - CustomAbstractScrollArea scrollarea_; - /// The view time scale in seconds per pixel. double scale_;