Merge branch 'stabilization/2106' into mbalfour/gitflow_210622

# Conflicts: # Code/Framework/AzQtComponents/AzQtComponents/Components/Style.cpp # Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h # Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp
2021-06-22 12:55:18 -05:00
parent c1b6bb122e d5490ecf69
commit df648db62e
184 changed files with 17071 additions and 1103 deletions
@@ -75,6 +75,8 @@ namespace AzFramework
        // Add a fullscreen button in the upper right of the title bar.
        [m_nativeWindow setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];

+        m_nativeWindow.tabbingMode = NSWindowTabbingModeDisallowed;
+        
        // Make the window active
        [m_nativeWindow makeKeyAndOrderFront:nil];
        m_nativeWindow.title = m_windowTitle;