X-Git-Url: http://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.hpp;fp=pv%2Fview%2Fview.hpp;h=8d5e60f2f35ed76262b6654c6ad85f66cbb4fc3b;hp=8ef8812cf5443aaaf1553343eeda27df6b77073b;hb=33094993339188a3baef302fb09eff6bf6bb6779;hpb=ad21e6c1a85b991c0363232baf18ba7edbe2e31a diff --git a/pv/view/view.hpp b/pv/view/view.hpp index 8ef8812c..8d5e60f2 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,8 @@ private: void set_scroll_default(); + bool header_fully_visible() const; + void update_layout(); TraceTreeItemOwner* find_prevalent_trace_group( @@ -400,9 +402,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 +414,6 @@ private: vector< shared_ptr > decode_traces_; #endif - CustomAbstractScrollArea scrollarea_; - /// The view time scale in seconds per pixel. double scale_;