From 6b67727bd89512f57986a7dfd47b17fe7b86c5e9 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 12 Apr 2019 22:17:33 +1000
Subject: [PATCH] minor node editor enhancements

---
 panels/nodeeditor.cpp | 23 +++++++++++++++--------
 ui/nodeui.cpp         |  2 +-
 ui/nodeview.cpp       | 10 +++++++---
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/panels/nodeeditor.cpp b/panels/nodeeditor.cpp
index c6310638c..73d24bd30 100644
--- a/panels/nodeeditor.cpp
+++ b/panels/nodeeditor.cpp
@@ -33,18 +33,25 @@ void NodeEditor::Retranslate()
 void NodeEditor::LoadEvent()
 {
   nodes_.resize(open_effects_.size());
-  for (int i=0;i<open_effects_.size();i++) {
-    EffectUI* effect_ui = open_effects_.at(i);
 
-    NodeUI* node_ui = new NodeUI();
+  if (!open_effects_.isEmpty()) {
+    Clip* first_clip = open_effects_.first()->GetEffect()->parent_clip;
 
-    effect_ui->SetNodeParent(node_ui);
-    effect_ui->SetSelectable(false);
+    for (int i=0;i<open_effects_.size();i++) {
+      EffectUI* effect_ui = open_effects_.at(i);
 
-    node_ui->SetWidget(effect_ui);
-    node_ui->AddToScene(&scene_);
+      if (effect_ui->GetEffect()->parent_clip == first_clip) {
+        NodeUI* node_ui = new NodeUI();
 
-    nodes_[i] = node_ui;
+        effect_ui->SetNodeParent(node_ui);
+        effect_ui->SetSelectable(false);
+
+        node_ui->SetWidget(effect_ui);
+        node_ui->AddToScene(&scene_);
+
+        nodes_[i] = node_ui;
+      }
+    }
   }
 }
 
diff --git a/ui/nodeui.cpp b/ui/nodeui.cpp
index 9e29e6db5..de263e07d 100644
--- a/ui/nodeui.cpp
+++ b/ui/nodeui.cpp
@@ -15,7 +15,7 @@
 #include "global/math.h"
 
 const int kRoundedRectRadius = 5;
-const int kNodePlugSize = 10;
+const int kNodePlugSize = 12;
 
 NodeUI::NodeUI() :
   central_widget_(nullptr),
diff --git a/ui/nodeview.cpp b/ui/nodeview.cpp
index be1681fa1..3998fab9c 100644
--- a/ui/nodeview.cpp
+++ b/ui/nodeview.cpp
@@ -49,9 +49,13 @@ void NodeView::mouseReleaseEvent(QMouseEvent *event)
 
 void NodeView::wheelEvent(QWheelEvent *event)
 {
-  if (event->angleDelta().y() < 0) {
-    scale(0.9, 0.9);
+  if (event->modifiers() & Qt::ControlModifier) {
+    if (event->angleDelta().y() < 0) {
+      scale(0.9, 0.9);
+    } else {
+      scale(1.1, 1.1);
+    }
   } else {
-    scale(1.1, 1.1);
+    QGraphicsView::wheelEvent(event);
   }
 }