Merge commit '3d84876e87a3c28a420d74c19606d1fbe5c703d3' into amzn-tommy/gitflow_211116_o3de2

This commit is contained in:
Tommy Walton
2021-11-16 12:54:38 -08:00
@@ -50,8 +50,9 @@ namespace AtomToolsFramework
void AtomToolsMainWindow::ActivateWindow()
{
activateWindow();
show();
raise();
activateWindow();
}
bool AtomToolsMainWindow::AddDockWidget(const AZStd::string& name, QWidget* widget, uint32_t area, uint32_t orientation)