summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Studio/Palettes/Timeline/Bindings
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2018-10-19 12:58:50 +0300
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2018-10-19 10:19:42 +0000
commit7d0db8a7fb440b8129bffe2914c48d296c2f9075 (patch)
treeb450fc489f162c25ecc6407632aee7282daaa5fc /src/Authoring/Studio/Palettes/Timeline/Bindings
parentc5a7a92c58871b1de7019494e741db12e0d33727 (diff)
Make time and duration edit dialog showing asynchronous
These dialogs are shown in response to double click on the timeline. Showing a modal dialog in middle of mouse click handling is apparently not fine, so changed the showing to asynchronous. Task-number: QT3DS-2528 Change-Id: Ib5a9058afa205419845bfd115cc9eabedf10410c Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Palettes/Timeline/Bindings')
-rw-r--r--src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineTimebar.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineTimebar.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineTimebar.cpp
index 8c76046c..d23899fd 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineTimebar.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineTimebar.cpp
@@ -44,6 +44,8 @@
#include "ITimelineItemBinding.h"
#include "RowTree.h"
#include "RowTimeline.h"
+#include "StudioApp.h"
+#include "Dialogs.h"
Qt3DSDMTimelineTimebar::Qt3DSDMTimelineTimebar(
CTimelineTranslationManager *inTimelineTranslationManager,
@@ -216,9 +218,7 @@ void Qt3DSDMTimelineTimebar::SetTimebarComment(const Q3DStudio::CString &inComme
void Qt3DSDMTimelineTimebar::SetTimebarTime(ITimeChangeCallback *inCallback /*= nullptr*/)
{
- long theStartTime = GetStartTime();
- long theEndTime = GetEndTime();
- CDurationEditDlg theDurationEditDlg;
- theDurationEditDlg.showDialog(theStartTime, theEndTime, m_TimelineTranslationManager->GetDoc(),
- inCallback);
+ g_StudioApp.GetDialogs()->asyncDisplayDurationEditDialog(GetStartTime(), GetEndTime(),
+ m_TimelineTranslationManager->GetDoc(),
+ inCallback);
}