Merge branch 'development' into Atom/guthadam/atomtools_support_ly_set_gem_variant_to_load
This commit is contained in:
-2
@@ -159,8 +159,6 @@ namespace AtomToolsFramework
|
||||
AZ::RPI::ViewPtr m_defaultCamera;
|
||||
// Our viewport-local aux geom pipeline for supplemental rendering.
|
||||
AZ::RPI::AuxGeomDrawPtr m_auxGeom;
|
||||
// Used to keep track of a pending resize event to avoid initialization before window activate.
|
||||
bool m_windowResizedEvent = false;
|
||||
// Tracks whether the cursor is currently over our viewport, used for mouse input event book-keeping.
|
||||
bool m_mouseOver = false;
|
||||
// The last recorded mouse position, in local viewport screen coordinates.
|
||||
|
||||
@@ -254,28 +254,11 @@ namespace AtomToolsFramework
|
||||
|
||||
void RenderViewportWidget::resizeEvent([[maybe_unused]] QResizeEvent* event)
|
||||
{
|
||||
// We need to wait until the window is activated, so the underlying surface
|
||||
// has been created and has the correct size.
|
||||
if (windowHandle()->isActive())
|
||||
{
|
||||
SendWindowResizeEvent();
|
||||
}
|
||||
else
|
||||
{
|
||||
m_windowResizedEvent = true;
|
||||
}
|
||||
SendWindowResizeEvent();
|
||||
}
|
||||
|
||||
bool RenderViewportWidget::event(QEvent* event)
|
||||
{
|
||||
// Check if we have a pending resize event.
|
||||
// At this point the surface has been created and has
|
||||
// the proper dimensions.
|
||||
if (event->type() == QEvent::WindowActivate && m_windowResizedEvent)
|
||||
{
|
||||
SendWindowResizeEvent();
|
||||
}
|
||||
|
||||
return QWidget::event(event);
|
||||
}
|
||||
|
||||
@@ -372,7 +355,6 @@ namespace AtomToolsFramework
|
||||
|
||||
AzFramework::WindowNotificationBus::Event(
|
||||
GetNativeWindowHandle(), &AzFramework::WindowNotifications::OnWindowResized, windowSize.width(), windowSize.height());
|
||||
m_windowResizedEvent = false;
|
||||
}
|
||||
|
||||
void RenderViewportWidget::NotifyUpdateRefreshRate()
|
||||
|
||||
Reference in New Issue
Block a user