summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Studio/MainFrm.cpp
diff options
context:
space:
mode:
authorMahmoud Badri <mahmoud.badri@qt.io>2018-05-09 12:24:38 +0300
committerMahmoud Badri <mahmoud.badri@qt.io>2018-05-09 09:33:52 +0000
commit8dbaa56ecd6cb56a617eb9c9156b037a48e59a71 (patch)
treea293afec940abe2c3894cb649b8a77de5d75be9a /src/Authoring/Studio/MainFrm.cpp
parent4037748fd38f7a30f92930f800e7f74a5469c4d0 (diff)
Support drag&drop objects into timeline
Implement dragging items from the "Basic Objects" and project assets to the timeline tree part. Task-number: QT3DS-1455 Change-Id: Iafb58d647221c63dcaa5ac9cced3ab9ee8de2a68 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/Authoring/Studio/MainFrm.cpp')
-rw-r--r--src/Authoring/Studio/MainFrm.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Authoring/Studio/MainFrm.cpp b/src/Authoring/Studio/MainFrm.cpp
index 0aace15e..bdca8bc2 100644
--- a/src/Authoring/Studio/MainFrm.cpp
+++ b/src/Authoring/Studio/MainFrm.cpp
@@ -60,6 +60,7 @@
#include "TimelineWidget.h"
#include "ProjectView.h"
#include "RowTree.h"
+#include "WidgetControl.h"
#include <QtGui/qevent.h>
#include <QtGui/qdesktopservices.h>
@@ -1845,8 +1846,9 @@ void CMainFrame::OnConnectionChanged(bool connected)
TimelineWidget *CMainFrame::getTimelineWidget() const
{
- return static_cast<TimelineWidget *>(m_paletteManager->GetControl(
- CPaletteManager::CONTROLTYPE_TIMELINE)->widget());
+ WidgetControl *control = static_cast<WidgetControl *>
+ (m_paletteManager->GetControl(CPaletteManager::CONTROLTYPE_TIMELINE)->widget());
+ return static_cast<TimelineWidget *>(control->getControl());
}
CRecentItems *CMainFrame::GetRecentItems()