summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Studio/Render/StudioRenderer.cpp
diff options
context:
space:
mode:
authorKaj Grönholm <kaj.gronholm@qt.io>2018-12-03 15:09:10 +0200
committerKaj Grönholm <kaj.gronholm@qt.io>2018-12-04 08:29:57 +0000
commitac0d565d5bfcf5f237c27c5f9be480625b114e7e (patch)
treec7bcfc02b6f958ce2ed61e3b79a5b683128edba5 /src/Authoring/Studio/Render/StudioRenderer.cpp
parentc3f56555c8b47ab0cc200fb37e182057a4045a19 (diff)
Don't start playback when interacting with scene
Task-number: QT3DS-2438 Change-Id: I0c6988ff5016dc0016a031d34a5758a624140458 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Render/StudioRenderer.cpp')
-rw-r--r--src/Authoring/Studio/Render/StudioRenderer.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/Authoring/Studio/Render/StudioRenderer.cpp b/src/Authoring/Studio/Render/StudioRenderer.cpp
index c5e2c8e6..c8888c13 100644
--- a/src/Authoring/Studio/Render/StudioRenderer.cpp
+++ b/src/Authoring/Studio/Render/StudioRenderer.cpp
@@ -118,6 +118,7 @@ struct SRendererImpl : public IStudioRenderer,
QScopedPointer<Q3DSQmlStreamProxy> m_proxy;
QMap<QString, int> m_initialFrameMap;
bool m_fullSizePreview = false;
+ bool m_mouseDown = false;
SRendererImpl()
: m_Dispatch(*g_StudioApp.GetCore()->GetDispatch())
@@ -408,6 +409,11 @@ struct SRendererImpl : public IStudioRenderer,
}
}
+ bool isMouseDown() const override
+ {
+ return m_mouseDown;
+ }
+
void MakeContextCurrent() override
{
m_RenderContext->BeginRender();
@@ -770,6 +776,7 @@ struct SRendererImpl : public IStudioRenderer,
if (m_Translation == nullptr)
return;
+ m_mouseDown = true;
inPoint.setX(inPoint.x() * m_pixelRatio);
inPoint.setY(inPoint.y() * m_pixelRatio);
@@ -1033,6 +1040,7 @@ struct SRendererImpl : public IStudioRenderer,
void OnSceneMouseUp(SceneDragSenderType::Enum) override
{
m_MaybeDragStart = false;
+ m_mouseDown = false;
Qt3DSDMGuideHandle theSelectedGuide;
if (m_PickResult.getType() == StudioPickValueTypes::Guide) {
theSelectedGuide = m_PickResult.getData<Qt3DSDMGuideHandle>();