summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2018-06-06 15:21:15 +0300
committerTomi Korpipää <tomi.korpipaa@qt.io>2018-06-07 04:16:05 +0000
commit0de1d1ba224d1f51a01b7870e31e5b032996d9f7 (patch)
treeff2f825fec70d67254b166d540ab703456d146f4
parentcc26c53ccd908bcb724d9566813e122a200eded6 (diff)
Autoscroll timeline tree when dragging from basic objects/project
Task-number: QT3DS-1889 Change-Id: Ie905b74d97590c0f08fea2555a5d14c807728436 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
-rw-r--r--src/Authoring/Studio/Palettes/TimelineGraphicsView/TimelineGraphicsScene.h2
-rw-r--r--src/Authoring/Studio/Palettes/TimelineGraphicsView/TimelineWidget.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/Authoring/Studio/Palettes/TimelineGraphicsView/TimelineGraphicsScene.h b/src/Authoring/Studio/Palettes/TimelineGraphicsView/TimelineGraphicsScene.h
index 00d71023..408721b3 100644
--- a/src/Authoring/Studio/Palettes/TimelineGraphicsView/TimelineGraphicsScene.h
+++ b/src/Authoring/Studio/Palettes/TimelineGraphicsView/TimelineGraphicsScene.h
@@ -85,6 +85,7 @@ public:
TExpandMap &expandMap();
void resetMousePressParams();
QLabel *timebarTooltip();
+ void updateAutoScrolling(double scenePosY);
protected:
bool event(QEvent *event) override;
@@ -114,7 +115,6 @@ private:
void handleShySelected();
void handleLockSelected();
void handleApplicationFocusLoss();
- void updateAutoScrolling(double scenePosY);
QGraphicsLinearLayout *m_layoutRoot;
QGraphicsLinearLayout *m_layoutTree;
diff --git a/src/Authoring/Studio/Palettes/TimelineGraphicsView/TimelineWidget.cpp b/src/Authoring/Studio/Palettes/TimelineGraphicsView/TimelineWidget.cpp
index 716a9677..b3269aca 100644
--- a/src/Authoring/Studio/Palettes/TimelineGraphicsView/TimelineWidget.cpp
+++ b/src/Authoring/Studio/Palettes/TimelineGraphicsView/TimelineWidget.cpp
@@ -850,6 +850,8 @@ CDropTarget *TimelineWidget::FindDropCandidate(CPt &inMousePoint, Qt::KeyboardMo
}
}
+ m_graphicsScene->updateAutoScrolling(mouseY);
+
return theTarget;
}