Fix Editor play mode exit bug after closing maximized Game window

This commit is contained in:
Wojtek Figat
2022-07-02 20:59:55 +02:00
parent d0955a5ac0
commit 400c4bb570

View File

@@ -67,6 +67,7 @@ namespace FlaxEditor.Windows
if (_isMaximized == value) if (_isMaximized == value)
return; return;
_isMaximized = value; _isMaximized = value;
var rootWindow = RootWindow;
if (value) if (value)
{ {
// Maximize // Maximize
@@ -77,13 +78,14 @@ namespace FlaxEditor.Windows
var monitorBounds = Platform.GetMonitorBounds(PointToScreen(Size * 0.5f)); var monitorBounds = Platform.GetMonitorBounds(PointToScreen(Size * 0.5f));
ShowFloating(monitorBounds.Location + new Float2(200, 200), Float2.Zero, WindowStartPosition.Manual); ShowFloating(monitorBounds.Location + new Float2(200, 200), Float2.Zero, WindowStartPosition.Manual);
} }
if (!RootWindow.IsMaximized) if (rootWindow != null && !rootWindow.IsMaximized)
RootWindow.Maximize(); rootWindow.Maximize();
} }
else else
{ {
// Restore // Restore
RootWindow.Restore(); if (rootWindow != null)
rootWindow.Restore();
if (_maximizeRestoreDockTo != null && _maximizeRestoreDockTo.IsDisposing) if (_maximizeRestoreDockTo != null && _maximizeRestoreDockTo.IsDisposing)
_maximizeRestoreDockTo = null; _maximizeRestoreDockTo = null;
Show(_maximizeRestoreDockState, _maximizeRestoreDockTo); Show(_maximizeRestoreDockState, _maximizeRestoreDockTo);