birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' into chore/rename-Graph-EditorGraph-Match

Browse Source
This commit is contained in:
Luis Sempé
2022-01-18 12:35:58 -08:00
committed by GitHub
parent 4f746fddac f2b1970e8f
commit 891a13631e
1346 changed files with 38972 additions and 26851 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp
+32 -15
View File
@@ -1136,23 +1136,20 @@ namespace ScriptCanvasEditor
return AZ::Success(outTabIndex);
}
auto loadedGraph = LoadFromFile(fileAssetId.Path().c_str());
if (!loadedGraph.IsSuccess())
auto loadedGraphOutcome = LoadFromFile(fileAssetId.Path().c_str());
if (!loadedGraphOutcome.IsSuccess())
{
return AZ::Failure(AZStd::string("Failed to load graph at %s", fileAssetId.Path().c_str()));
return AZ::Failure(AZStd::string::format("Failed to load graph at %s", fileAssetId.Path().c_str()));
}
outTabIndex = CreateAssetTab(loadedGraph.GetValue(), fileState);
if (!m_isRestoringWorkspace)
{
SetActiveAsset(loadedGraph.GetValue());
}
auto loadedGraph = loadedGraphOutcome.TakeValue();
CompleteDescriptionInPlace(loadedGraph);
outTabIndex = CreateAssetTab(loadedGraph, fileState);
if (outTabIndex >= 0)
{
AddRecentFile(loadedGraph.GetValue().Path().c_str());
OpenScriptCanvasAssetImplementation(loadedGraph.GetValue(), fileState);
AddRecentFile(loadedGraph.Path().c_str());
OpenScriptCanvasAssetImplementation(loadedGraph, fileState);
return AZ::Success(outTabIndex);
}
else
@@ -1169,6 +1166,11 @@ namespace ScriptCanvasEditor
return AZ::Failure(AZStd::string("Unable to open asset with invalid asset id"));
}
if (!m_isRestoringWorkspace)
{
SetActiveAsset(scriptCanvasAsset);
}
if (!scriptCanvasAsset.IsDescriptionValid())
{
if (!m_isRestoringWorkspace)
@@ -1345,9 +1347,11 @@ namespace ScriptCanvasEditor
AZ::Outcome<ScriptCanvasEditor::SourceHandle, AZStd::string> outcome = LoadFromFile(fullPath);
if (!outcome.IsSuccess())
{
QMessageBox::warning(this, "Invalid Source File", QString("'%1' failed to load properly.").arg(fullPath), QMessageBox::Ok);
QMessageBox::warning(this, "Invalid Source File"
, QString("'%1' failed to load properly.\nFailure: %2").arg(fullPath).arg(outcome.GetError().c_str()), QMessageBox::Ok);
m_errorFilePath = fullPath;
AZ_Warning("ScriptCanvas", false, "Unable to open file as a ScriptCanvas graph: %s", fullPath);
AZ_Warning("ScriptCanvas", false, "Unable to open file as a ScriptCanvas graph: %s. Failure: %s"
, fullPath, outcome.GetError().c_str());
return;
}
@@ -1596,7 +1600,14 @@ namespace ScriptCanvasEditor
bool MainWindow::OnFileSave()
{
return SaveAssetImpl(m_activeGraph, Save::InPlace);
if (auto metaData = m_tabBar->GetTabData(m_activeGraph); metaData && metaData->m_fileState == Tracker::ScriptCanvasFileState::NEW)
{
return SaveAssetImpl(m_activeGraph, Save::As);
}
else
{
return SaveAssetImpl(m_activeGraph, Save::InPlace);
}
}
bool MainWindow::OnFileSaveAs()
@@ -3862,7 +3873,13 @@ namespace ScriptCanvasEditor
contextMenu.AddMenuAction(aznew ConvertReferenceToVariableNodeAction(&contextMenu));
contextMenu.AddMenuAction(aznew ExposeSlotMenuAction(&contextMenu));
contextMenu.AddMenuAction(aznew CreateAzEventHandlerSlotMenuAction(&contextMenu));
contextMenu.AddMenuAction(aznew SetDataSlotTypeMenuAction(&contextMenu));
auto setSlotTypeAction = aznew SetDataSlotTypeMenuAction(&contextMenu);
// Changing slot type is disabled temporarily because now that that user data slots are correctly coordinated with their reference
// variables, their type cannot be changed. The next change will allow all variables to change their type post creation, and then
// that will allow this action to be enabled.
setSlotTypeAction->setEnabled(false);
contextMenu.AddMenuAction(setSlotTypeAction);
return HandleContextMenu(contextMenu, slotId, screenPoint, scenePoint);
}