Fix scrolling in area below tracks

parent bb91f7a1
......@@ -766,8 +766,8 @@ Rectangle {
flickableItem.interactive: false
clip: true
Rectangle {
width: Math.max(root.width - headerWidth - scrollView.__verticalScrollBar.width, timeline.fullDuration * timeScale)
height: trackHeaders.height
width: Math.max(scrollView.width - scrollView.__verticalScrollBar.width, timeline.fullDuration * timeScale)
height: Math.max(trackHeaders.height, scrollView.height - scrollView.__horizontalScrollBar.height)
color: activePalette.window
id: tracksContainerArea
MouseArea {
......
......@@ -109,19 +109,6 @@ void TimelineWidget::slotChangeZoom(int value, bool zoomOnMouse)
m_proxy->setScaleFactorOnMouse(100.0 / comboScale[value], zoomOnMouse);
}
void TimelineWidget::wheelEvent(QWheelEvent *event)
{
if ((event->modifiers() & Qt::ControlModifier) != 0u) {
if (event->delta() > 0) {
emit zoomIn(true);
} else {
emit zoomOut(true);
}
} else {
QQuickWidget::wheelEvent(event);
}
}
Mlt::Tractor *TimelineWidget::tractor()
{
return m_proxy->tractor();
......
......@@ -52,7 +52,6 @@ public:
protected:
void mousePressEvent(QMouseEvent *event) override;
void wheelEvent(QWheelEvent *event) override;
public slots:
void slotChangeZoom(int value, bool zoomOnMouse);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment