From a422f6e369eb86e02852e4578a098987171edf1b Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Thu, 23 Apr 2020 01:00:26 +1000
Subject: [PATCH] timelineviewbase: decrease ctrl+scroll speed

---
 app/widget/timelinewidget/timelinewidget.cpp        | 6 +++---
 app/widget/timelinewidget/view/timelineviewbase.cpp | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/widget/timelinewidget/timelinewidget.cpp b/app/widget/timelinewidget/timelinewidget.cpp
index f1c3b717b..0ce7604d8 100644
--- a/app/widget/timelinewidget/timelinewidget.cpp
+++ b/app/widget/timelinewidget/timelinewidget.cpp
@@ -260,9 +260,9 @@ void TimelineWidget::DisconnectNodeInternal(ViewerOutput *n)
 
   Clear();
 
-  for (int i=0;i<views_.size();i++) {
-    TrackView* track_view = views_.at(i)->track_view();
-    track_view->DisconnectTrackList();
+  foreach (TimelineAndTrackView* tview, views_) {
+    tview->track_view()->DisconnectTrackList();
+    tview->view()->ConnectTrackList(nullptr);
   }
 }
 
diff --git a/app/widget/timelinewidget/view/timelineviewbase.cpp b/app/widget/timelinewidget/view/timelineviewbase.cpp
index bd1e97960..f10108831 100644
--- a/app/widget/timelinewidget/view/timelineviewbase.cpp
+++ b/app/widget/timelinewidget/view/timelineviewbase.cpp
@@ -311,9 +311,9 @@ bool TimelineViewBase::HandleZoomFromScroll(QWheelEvent *event)
     // If CTRL is held (or a preference is set to swap CTRL behavior), we zoom instead of scrolling
     if (event->delta() != 0) {
       if (event->delta() > 0) {
-        emit ScaleChanged(GetScale() * 2.0);
+        emit ScaleChanged(GetScale() * 1.1);
       } else {
-        emit ScaleChanged(GetScale() * 0.5);
+        emit ScaleChanged(GetScale() * 0.9);
       }
     }