From 937acd4c8cf207936f99891f7becf15115faa3bf Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 11 Oct 2019 18:37:19 +1100
Subject: [PATCH] cleaned Y coordinates

---
 .../timelineview/timelineviewghostitem.cpp     |  3 +--
 app/widget/timelineview/timelineviewrect.cpp   | 18 +-----------------
 app/widget/timelineview/timelineviewrect.h     |  6 +-----
 app/widget/timelineview/tool/import.cpp        |  3 +--
 app/widget/timelineview/tool/pointer.cpp       |  7 +++----
 app/widget/timelinewidget/timelinewidget.cpp   |  3 +--
 6 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/app/widget/timelineview/timelineviewghostitem.cpp b/app/widget/timelineview/timelineviewghostitem.cpp
index 5e0bf3661..982232348 100644
--- a/app/widget/timelineview/timelineviewghostitem.cpp
+++ b/app/widget/timelineview/timelineviewghostitem.cpp
@@ -40,8 +40,7 @@ TimelineViewGhostItem *TimelineViewGhostItem::FromBlock(Block *block, const Trac
   ghost->SetOut(block->out());
   ghost->SetMediaIn(block->media_in());
   ghost->SetTrack(track);
-  ghost->SetY(y);
-  ghost->SetHeight(height);
+  ghost->SetYCoords(y, height);
   ghost->setData(kAttachedBlock, Node::PtrToValue(block));
 
   if (block->type() == Block::kClip) {
diff --git a/app/widget/timelineview/timelineviewrect.cpp b/app/widget/timelineview/timelineviewrect.cpp
index 0bae0d2ae..0aa1edc10 100644
--- a/app/widget/timelineview/timelineviewrect.cpp
+++ b/app/widget/timelineview/timelineviewrect.cpp
@@ -28,25 +28,9 @@ TimelineViewRect::TimelineViewRect(QGraphicsItem* parent) :
 
 }
 
-const int &TimelineViewRect::Y()
-{
-  return y_;
-}
-
-void TimelineViewRect::SetY(const int &y)
+void TimelineViewRect::SetYCoords(int y, int height)
 {
   y_ = y;
-
-  UpdateRect();
-}
-
-const int &TimelineViewRect::Height()
-{
-  return height_;
-}
-
-void TimelineViewRect::SetHeight(const int &height)
-{
   height_ = height;
 
   UpdateRect();
diff --git a/app/widget/timelineview/timelineviewrect.h b/app/widget/timelineview/timelineviewrect.h
index a7140708a..4e891f10b 100644
--- a/app/widget/timelineview/timelineviewrect.h
+++ b/app/widget/timelineview/timelineviewrect.h
@@ -34,11 +34,7 @@ class TimelineViewRect : public QGraphicsRectItem, public TimelineScaledObject
 public:
   TimelineViewRect(QGraphicsItem* parent = nullptr);
 
-  const int& Y();
-  void SetY(const int& y);
-
-  const int& Height();
-  void SetHeight(const int& height);
+  void SetYCoords(int y, int height);
 
   const TrackReference& Track();
   void SetTrack(const TrackReference& track);
diff --git a/app/widget/timelineview/tool/import.cpp b/app/widget/timelineview/tool/import.cpp
index 6b16e5256..f93125c3a 100644
--- a/app/widget/timelineview/tool/import.cpp
+++ b/app/widget/timelineview/tool/import.cpp
@@ -172,8 +172,7 @@ void TimelineWidget::ImportTool::DragMove(TimelineViewMouseEvent *event)
       ghost->SetTrackAdjustment(track_movement);
 
       TrackReference adjusted_track = ghost->GetAdjustedTrack();
-      ghost->SetY(parent()->GetTrackY(adjusted_track));
-      ghost->SetHeight(parent()->GetTrackHeight(adjusted_track));
+      ghost->SetYCoords(parent()->GetTrackY(adjusted_track), parent()->GetTrackHeight(adjusted_track));
 
       earliest_ghost = qMin(earliest_ghost, ghost->GetAdjustedIn());
     }
diff --git a/app/widget/timelineview/tool/pointer.cpp b/app/widget/timelineview/tool/pointer.cpp
index 06e1fd813..8ddba61cb 100644
--- a/app/widget/timelineview/tool/pointer.cpp
+++ b/app/widget/timelineview/tool/pointer.cpp
@@ -249,9 +249,9 @@ void TimelineWidget::PointerTool::ProcessDrag(const TimelineCoordinate &mouse_po
 
       // Track movement is only legal for moving, not for trimming
       ghost->SetTrackAdjustment(track_movement);
+
       const TrackReference& track = ghost->GetAdjustedTrack();
-      ghost->SetY(parent()->GetTrackY(track));
-      ghost->SetHeight(parent()->GetTrackHeight(track));
+      ghost->SetYCoords(parent()->GetTrackY(track), parent()->GetTrackHeight(track));
       break;
     }
     }
@@ -341,8 +341,7 @@ TimelineViewGhostItem* TimelineWidget::PointerTool::AddGhostFromNull(const ratio
   ghost->SetIn(in);
   ghost->SetOut(out);
   ghost->SetTrack(track);
-  ghost->SetY(parent()->GetTrackY(track));
-  ghost->SetHeight(parent()->GetTrackHeight(track));
+  ghost->SetYCoords(parent()->GetTrackY(track), parent()->GetTrackHeight(track));
 
   AddGhostInternal(ghost, mode);
 
diff --git a/app/widget/timelinewidget/timelinewidget.cpp b/app/widget/timelinewidget/timelinewidget.cpp
index 232aa1ff7..58eef54e1 100644
--- a/app/widget/timelinewidget/timelinewidget.cpp
+++ b/app/widget/timelinewidget/timelinewidget.cpp
@@ -529,8 +529,7 @@ void TimelineWidget::AddBlock(Block *block, TrackReference track)
 
     // Set up clip with view parameters (clip item will automatically size its rect accordingly)
     item->SetBlock(block);
-    item->SetY(GetTrackY(track));
-    item->SetHeight(GetTrackHeight(track));
+    item->SetYCoords(GetTrackY(track), GetTrackHeight(track));
     item->SetScale(scale_);
     item->SetTrack(track);