From 7d87b9cd97a7d429dc3a3f4366407fd16b2a7595 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@theqtcompany.com>
Date: Thu, 12 Nov 2015 12:05:45 +0100
Subject: [PATCH] Timeline: Pass the right dragOffset to CategoryLabels

Also, make sure the category dragger only reacts to vertical mouse
movements.

Change-Id: Ic53db9030536a1f2d35ea02facb920a4d3f0a005
Task-number: QTCREATORBUG-15333
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
---
 src/libs/timeline/qml/CategoryLabel.qml  | 1 +
 src/libs/timeline/qml/TimelineLabels.qml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libs/timeline/qml/CategoryLabel.qml b/src/libs/timeline/qml/CategoryLabel.qml
index 984d23519f5..a822ad835d2 100644
--- a/src/libs/timeline/qml/CategoryLabel.qml
+++ b/src/libs/timeline/qml/CategoryLabel.qml
@@ -63,6 +63,7 @@ Item {
         cursorShape: dragging ? Qt.ClosedHandCursor : Qt.OpenHandCursor
         drag.minimumY: dragging ? 0 : -dragOffset // Account for parent change below
         drag.maximumY: draggerParent.height - (dragging ? 0 : dragOffset)
+        drag.axis: Drag.YAxis
     }
 
     DropArea {
diff --git a/src/libs/timeline/qml/TimelineLabels.qml b/src/libs/timeline/qml/TimelineLabels.qml
index ba3f883a420..c8eb63719bd 100644
--- a/src/libs/timeline/qml/TimelineLabels.qml
+++ b/src/libs/timeline/qml/TimelineLabels.qml
@@ -102,7 +102,7 @@ Flickable {
                         draggerParent: categories
                         width: 150
                         height: parent.height
-                        dragOffset: parent.y
+                        dragOffset: loader.y
 
                         onDropped: {
                             categories.moveCategories(sourceIndex, targetIndex);