diff options
author | Mike Krus <mike.krus@kdab.com> | 2019-09-04 10:31:54 +0100 |
---|---|---|
committer | Mike Krus <mike.krus@kdab.com> | 2019-09-04 15:01:44 +0000 |
commit | 1b8f94a1dd9a95b38ae612b37ce8de875daaec12 (patch) | |
tree | 6f5532d697e2402791d2a5dbb9c37bf07670cc0d /src/extras/defaults | |
parent | 41ffdd54c743cca0a9f88f5513c7f5efa8cd2cba (diff) |
Disable frame action when camera controller is disabled
If a camera controller gets disabled while a movement is in
progress, it may start moving indefinitely without any mouse
events, or not respond to mouse events to stop the movement.
Disabling the frame action will prevent this.
Task-number: QTBUG-77996
Change-Id: I0120436a8ff9ff8b4306c41053aa494ac2ec3f42
Reviewed-by: Akihito Izawa <akihito.izawa@qt.io>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/extras/defaults')
-rw-r--r-- | src/extras/defaults/qabstractcameracontroller.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/extras/defaults/qabstractcameracontroller.cpp b/src/extras/defaults/qabstractcameracontroller.cpp index 527ee7e8d..27df65d7b 100644 --- a/src/extras/defaults/qabstractcameracontroller.cpp +++ b/src/extras/defaults/qabstractcameracontroller.cpp @@ -209,7 +209,8 @@ void QAbstractCameraControllerPrivate::init() // Disable the logical device when the entity is disabled QObject::connect(q, &Qt3DCore::QEntity::enabledChanged, m_logicalDevice, &Qt3DInput::QLogicalDevice::setEnabled); - + QObject::connect(q, &Qt3DCore::QEntity::enabledChanged, + m_frameAction, &Qt3DLogic::QFrameAction::setEnabled); QObject::connect(m_escapeButtonAction, &Qt3DInput::QAction::activeChanged, q, [this](bool isActive) { |