Merge pull request #1471 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15292

[ATOM-15292] Camera no longer resets when typing something
This commit is contained in:
AMZN-mnaumov
2021-06-21 18:53:52 -07:00
committed by GitHub
@@ -10,6 +10,9 @@
*
*/
#include <QApplication>
#include <QWidget>
#include <AzCore/Serialization/SerializeContext.h>
#include <AzCore/Component/TransformBus.h>
#include <AzCore/Math/Matrix4x4.h>
@@ -223,7 +226,12 @@ namespace MaterialEditor
}
else if (inputChannelId == InputDeviceKeyboard::Key::AlphanumericZ && (m_keys & Ctrl) == None)
{
Reset();
// only reset camera if no other widget besides viewport is in focus
const auto focus = QApplication::focusWidget();
if (!focus || focus->objectName() == "Viewport")
{
Reset();
}
}
break;
case InputChannel::State::Updated: