Merge pull request #5710 from aws-lumberyard-dev/cgalvan/FixSlowScriptCanvasLoading

Fixed slow Script Canvas loading by moving error icon construction in NodePaletteTreeItem.
monroegm-disable-blank-issue-2
Chris Galvan 4 years ago committed by GitHub
commit 33abae1008
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -9,6 +9,10 @@
#include <GraphCanvas/Widgets/NodePalette/TreeItems/NodePaletteTreeItem.h>
AZ_PUSH_DISABLE_WARNING(4244 4251 4800, "-Wunknown-warning-option")
#include <QIcon>
AZ_POP_DISABLE_WARNING
namespace GraphCanvas
{
////////////////////////
@ -19,7 +23,6 @@ namespace GraphCanvas
NodePaletteTreeItem::NodePaletteTreeItem(AZStd::string_view name, EditorId editorId)
: GraphCanvas::GraphCanvasTreeItem()
, m_errorIcon(":/GraphCanvasEditorResources/toast_error_icon.png")
, m_editorId(editorId)
, m_name(QString::fromUtf8(name.data(), static_cast<int>(name.size())))
, m_selected(false)
@ -88,7 +91,7 @@ namespace GraphCanvas
case Qt::DecorationRole:
if (HasError())
{
return m_errorIcon;
return QIcon(":/GraphCanvasEditorResources/toast_error_icon.png");
}
break;
default:

@ -9,10 +9,6 @@
#include <AzCore/PlatformIncl.h>
AZ_PUSH_DISABLE_WARNING(4244 4251 4800, "-Wunknown-warning-option")
#include <QIcon>
AZ_POP_DISABLE_WARNING
#include <AzCore/RTTI/RTTI.h>
#include <AzCore/std/string/string.h>
#include <AzCore/std/string/string_view.h>
@ -113,7 +109,6 @@ namespace GraphCanvas
private:
// Error Display
QIcon m_errorIcon;
QString m_errorString;
AZStd::string m_styleOverride;

@ -881,6 +881,7 @@ namespace ScriptCanvasEditor
void NodePaletteModel::RepopulateModel()
{
AZ_PROFILE_FUNCTION(ScriptCanvas);
ClearRegistry();
PopulateNodePaletteModel((*this));

@ -428,6 +428,8 @@ namespace ScriptCanvasEditor
, m_closeCurrentGraphAfterSave(false)
, m_styleManager(ScriptCanvasEditor::AssetEditorId, "ScriptCanvas/StyleSheet/graphcanvas_style.json")
{
AZ_PROFILE_FUNCTION(ScriptCanvas);
VariablePaletteRequestBus::Handler::BusConnect();
GraphCanvas::AssetEditorAutomationRequestBus::Handler::BusConnect(ScriptCanvasEditor::AssetEditorId);

Loading…
Cancel
Save