From 44f7c0ab40e4059648e1c9444ebf358593a8affb Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Mon, 19 Aug 2019 13:33:34 +1000 Subject: [PATCH] playhead item covers entire scene --- app/ui/style/olive-dark/style.css | 2 +- app/widget/timelineview/timelineview.cpp | 12 ++++++++++++ app/widget/timelineview/timelineview.h | 2 ++ app/widget/timelineview/timelineviewplayheaditem.cpp | 2 +- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/app/ui/style/olive-dark/style.css b/app/ui/style/olive-dark/style.css index 8c3552592..b3f4d6722 100644 --- a/app/ui/style/olive-dark/style.css +++ b/app/ui/style/olive-dark/style.css @@ -77,5 +77,5 @@ NodeViewItemWidget { /* Timeline playhead styling */ TimelinePlayhead { qproperty-playheadColor: #ff0000; - qproperty-playheadHighlightColor: rgba(255, 255, 255, 0.33); + qproperty-playheadHighlightColor: rgba(255, 255, 255, 0.2); } diff --git a/app/widget/timelineview/timelineview.cpp b/app/widget/timelineview/timelineview.cpp index 3fce410db..e2080d742 100644 --- a/app/widget/timelineview/timelineview.cpp +++ b/app/widget/timelineview/timelineview.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -168,6 +169,17 @@ void TimelineView::dropEvent(QDropEvent *event) import_tool_.DragDrop(event); } +void TimelineView::resizeEvent(QResizeEvent *event) +{ + QGraphicsView::resizeEvent(event); + + if (scene_.height() < height()) { + QRectF rect = scene_.sceneRect(); + rect.setHeight(height() - horizontalScrollBar()->height() - 2); + scene_.setSceneRect(rect); + } +} + void TimelineView::AddGhost(TimelineViewGhostItem *ghost) { ghost->SetScale(scale_); diff --git a/app/widget/timelineview/timelineview.h b/app/widget/timelineview/timelineview.h index a4f563f11..1750ce2f6 100644 --- a/app/widget/timelineview/timelineview.h +++ b/app/widget/timelineview/timelineview.h @@ -75,6 +75,8 @@ protected: virtual void dragLeaveEvent(QDragLeaveEvent *event) override; virtual void dropEvent(QDropEvent *event) override; + virtual void resizeEvent(QResizeEvent *event) override; + private: class Tool diff --git a/app/widget/timelineview/timelineviewplayheaditem.cpp b/app/widget/timelineview/timelineviewplayheaditem.cpp index 66fce5ba9..ec4c81b89 100644 --- a/app/widget/timelineview/timelineviewplayheaditem.cpp +++ b/app/widget/timelineview/timelineviewplayheaditem.cpp @@ -51,7 +51,7 @@ void TimelineViewPlayheadItem::UpdateRect() double x = TimeToScreenCoord(rational(playhead_ * timebase_.numerator(), timebase_.denominator())); double width = TimeToScreenCoord(timebase_); - setRect(0, 0, width, scene()->height()); + setRect(0, 0, width, scene()->height()-1); setPos(x, 0); }