X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=c53c02e3abd44f8242dc7bd1ceaf3d43a38cf02b;hb=6e2c3c855dff36f6e946e2a54d576bea699f4a61;hp=3df87e540b986b0e08b1242c9139950f65f12a5b;hpb=b3f44329f5846bfb800ee53c15c65b2395d3ba0c;p=pulseview.git diff --git a/pv/view/view.cpp b/pv/view/view.cpp index 3df87e5..c53c02e 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -198,6 +198,7 @@ const Viewport* View::viewport() const vector< shared_ptr > View::time_items() const { vector< shared_ptr > items; + items.push_back(cursors_); items.push_back(cursors_->first()); items.push_back(cursors_->second()); return items; @@ -482,11 +483,11 @@ void View::update_scroll() // Set the vertical scrollbar verticalScrollBar()->setPageStep(areaSize.height()); + verticalScrollBar()->setSingleStep(areaSize.height() / 8); const pair extents = v_extents(); - const int extra_scroll_height = (extents.second - extents.first) / 4; - verticalScrollBar()->setRange(extents.first - extra_scroll_height, - extents.first + extra_scroll_height); + verticalScrollBar()->setRange(extents.first - (areaSize.height() / 2), + extents.second - (areaSize.height() / 2)); } void View::update_layout() @@ -606,7 +607,7 @@ void View::resizeEvent(QResizeEvent*) update_layout(); } -void View::appearance_changed(bool label, bool content) +void View::row_item_appearance_changed(bool label, bool content) { if (label) header_->update(); @@ -617,8 +618,8 @@ void View::appearance_changed(bool label, bool content) void View::extents_changed(bool horz, bool vert) { sticky_events_ |= - (horz ? SelectableItemHExtentsChanged : 0) | - (vert ? SelectableItemVExtentsChanged : 0); + (horz ? RowItemHExtentsChanged : 0) | + (vert ? RowItemVExtentsChanged : 0); lazy_event_handler_.start(); } @@ -741,9 +742,9 @@ void View::on_signals_moved() void View::process_sticky_events() { - if (sticky_events_ & SelectableItemHExtentsChanged) + if (sticky_events_ & RowItemHExtentsChanged) update_layout(); - if (sticky_events_ & SelectableItemVExtentsChanged) + if (sticky_events_ & RowItemVExtentsChanged) restack_all_row_items(); // Clear the sticky events