Adjusting node sizes further and tests fixes

cypress/e2e/flowControlNodes.cy.js

@@ -116,7 +116,7 @@ const tests = [
                 CustomProperties Pin (PinId=D255092C0E544047BB60DD4A8F5333D9,PinName="then",PinFriendlyName=NSLOCTEXT("K2Node", "Completed", "Completed"),Direction="EGPD_Output",PinType.PinCategory="exec",PinType.PinSubCategory="",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=False,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=False,bOrphanedPin=False,)
             End Object
         `,
-        size: [17, 9],
+        size: [17.5, 9],
         color: Configuration.nodeColors.blue,
         icon: SVGIcon.loop,
         pins: 5,
@@ -184,7 +184,7 @@ const tests = [
                 CustomProperties Pin (PinId=E547C9E4961A43AD944E6877C2FF44D6,PinName="StartIndex",PinType.PinCategory="int",PinType.PinSubCategory="",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,DefaultValue="-1",AutogeneratedDefaultValue="-1",PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=False,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=False,bOrphanedPin=False,)
             End Object
         `,
-        size: [14, 12],
+        size: [13.5, 12.5],
         color: Configuration.nodeColors.gray,
         icon: SVGIcon.sequence,
         pins: 7,

cypress/e2e/otherNodes.cy.js

@@ -456,7 +456,7 @@ const tests = [
                 CustomProperties Pin (PinId=649255CFBCB9480E8DC1AA214F9FCE6B,PinName="bTeleport",PinToolTip="Teleport\nBoolean\n\nWhether we teleport the physics state (if physics collision is enabled for this object). If true, physics velocity for this object is unchanged (so ragdoll parts are not affected by change in location). If false, physics velocity is updated based on the change in position (affecting ragdoll parts).",PinType.PinCategory="bool",PinType.PinSubCategory="",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,DefaultValue="false",AutogeneratedDefaultValue="false",PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=False,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=True,bOrphanedPin=False,)
             End Object
         `,
-        size: [15, 17],
+        size: [15, 16.5],
         color: Configuration.nodeColors.blue,
         icon: SVGIcon.functionSymbol,
         pins: 9,
@@ -472,6 +472,32 @@ const tests = [
         delegate: false,
         development: false,
     },
+    {
+        name: "Async Change Bundle State For Matching Primary Assets",
+        value: String.raw`
+            Begin Object Class=/Script/BlueprintGraph.K2Node_AsyncAction Name="K2Node_AsyncAction_0" ExportPath=/Script/BlueprintGraph.K2Node_AsyncAction'"/Temp/Untitled_1.Untitled_1:PersistentLevel.Untitled.EventGraph.K2Node_AsyncAction_0"'
+                ProxyFactoryFunctionName="AsyncChangeBundleStateForMatchingPrimaryAssets"
+                ProxyFactoryClass=/Script/CoreUObject.Class'"/Script/Engine.AsyncActionChangePrimaryAssetBundles"'
+                ProxyClass=/Script/CoreUObject.Class'"/Script/Engine.AsyncActionChangePrimaryAssetBundles"'
+                NodePosX=-384
+                NodePosY=-1152
+                NodeGuid=BE2398EE906341DFBF4027C551933479
+                CustomProperties Pin (PinId=0ADB80D7303A4B70A271609DEF026A74,PinName="execute",PinToolTip="\nExec",PinType.PinCategory="exec",PinType.PinSubCategory="",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=False,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=False,bOrphanedPin=False,)
+                CustomProperties Pin (PinId=982E6A6405014809B46CA263AA26EBE3,PinName="then",Direction="EGPD_Output",PinType.PinCategory="exec",PinType.PinSubCategory="",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=False,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=False,bOrphanedPin=False,)
+                CustomProperties Pin (PinId=58B7B76B29454FAD99B90931BD676CAB,PinName="Completed",PinFriendlyName=NSLOCTEXT("UObjectDisplayNames", "AsyncActionChangePrimaryAssetBundles:Completed", "Completed"),Direction="EGPD_Output",PinType.PinCategory="exec",PinType.PinSubCategory="",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=False,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=False,bOrphanedPin=False,)
+                CustomProperties Pin (PinId=FD58E0E4210D4714AFB0A5D049BF57D0,PinName="WorldContextObject",PinToolTip="World Context Object\nObject Reference",PinType.PinCategory="object",PinType.PinSubCategory="",PinType.PinSubCategoryObject=/Script/CoreUObject.Class'"/Script/CoreUObject.Object"',PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,PersistentGuid=00000000000000000000000000000000,bHidden=True,bNotConnectable=False,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=False,bOrphanedPin=False,)
+                CustomProperties Pin (PinId=C97FE20A5B2D450CA45CE0313CF86D19,PinName="NewBundles",PinToolTip="New Bundles\nArray of Names",PinType.PinCategory="name",PinType.PinSubCategory="",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=Array,PinType.bIsReference=True,PinType.bIsConst=True,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=False,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=True,bAdvancedView=False,bOrphanedPin=False,)
+                CustomProperties Pin (PinId=94C2A7BB42E8416B8F275FC59D536272,PinName="OldBundles",PinToolTip="Old Bundles\nArray of Names",PinType.PinCategory="name",PinType.PinSubCategory="",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=Array,PinType.bIsReference=True,PinType.bIsConst=True,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=False,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=True,bAdvancedView=False,bOrphanedPin=False,)
+            End Object
+        `,
+        size: [24.5, 7.5],
+        color: Configuration.nodeColors.blue,
+        icon: SVGIcon.node,
+        pins: 5,
+        pinNames: ["New Bundles", "Old Bundles", "Completed"],
+        delegate: false,
+        development: false,
+    },
 ]
 
 generateNodeTests(tests)

dist/css/ueb-style.css

@@ -1,18 +1,8 @@
-@font-face {
-  font-family: "Roboto";
-  font-weight: lighter;
-  src: url("../font/roboto-light.woff2") format("woff2");
-}
 @font-face {
   font-family: "Roboto";
   font-weight: normal;
   src: url("../font/roboto-regular.woff2") format("woff2");
 }
-@font-face {
-  font-family: "Roboto";
-  font-weight: bold;
-  src: url("../font/roboto-bold.woff2") format("woff2");
-}
 @font-face {
   font-family: "Roboto";
   font-stretch: condensed;
@@ -329,8 +319,9 @@ ueb-node[data-selected=true] > .ueb-node-border {
   min-height: 26px;
 }
 
-.ueb-node-style-operation .ueb-node-inputs {
+ueb-node.ueb-node-style-operation.ueb-node-has-inputs .ueb-node-inputs {
   align-self: center;
+  padding-right: 40px;
 }
 
 .ueb-node-style-operation:not(.ueb-node-is-variadic) .ueb-node-outputs {
@@ -352,8 +343,9 @@ ueb-blueprint[data-scrolling=false][data-selecting=false] ueb-node.ueb-node-styl
 .ueb-node-top {
   grid-area: top;
   color: #d0d0d0;
-  font-size: var(--ueb-font-size);
+  /* 1.030769 is to get an effective font size of 13.4px from --ueb-font-size which is 13 px */
-  font-weight: 600;
+  font-size: calc(1.030769 * var(--ueb-font-size));
+  font-weight: bold;
   line-height: 120%;
   white-space: nowrap;
 }
@@ -401,7 +393,7 @@ ueb-node.ueb-node-style-event .ueb-node-top {
 }
 
 .ueb-node-name:last-child {
-  padding-right: 16px;
+  padding-right: 26px;
 }
 
 .ueb-zoom--2 .ueb-node-name {
@@ -431,13 +423,19 @@ ueb-node[data-pure-function=true] .ueb-node-name-symbol {
 .ueb-node-subtitle-text {
   padding-top: 1px;
   padding-right: 5px;
+  /* 0.946154 is to get an effective font size of 12.3px from --ueb-font-size which is 13 px */
+  font-size: calc(0.946154 * var(--ueb-font-size));
   font-weight: 100;
   font-style: italic;
   color: #a9b78f;
 }
 
-.ueb-node-has-inputs .ueb-node-inputs {
+.ueb-node-inputs {
   grid-area: input;
+}
+
+ueb-node.ueb-node-has-inputs .ueb-node-inputs {
+  padding-right: 20px;
   padding-left: 5px;
 }
 
@@ -450,10 +448,6 @@ ueb-node[data-pure-function=true] .ueb-node-name-symbol {
   padding-right: 8px;
 }
 
-.ueb-node-has-inputs .ueb-node-inputs {
-  padding-right: 20px;
-}
-
 .ueb-node-variadic {
   grid-area: variadic;
   margin-top: 10px;

dist/ueblueprint.js

@@ -113,6 +113,7 @@ class Configuration {
     static paths = {
         addDelegate: "/Script/BlueprintGraph.K2Node_AddDelegate",
         ambientSound: "/Script/Engine.AmbientSound",
+        asyncAction: "/Script/BlueprintGraph.K2Node_AsyncAction",
         blueprint: "/Script/Engine.Blueprint",
         blueprintMapLibrary: "/Script/Engine.BlueprintMapLibrary",
         blueprintSetLibrary: "/Script/Engine.BlueprintSetLibrary",
@@ -3067,6 +3068,15 @@ class ObjectEntity extends IEntity {
         bColorCommentBubble: {
             type: Boolean,
         },
+        ProxyFactoryFunctionName: {
+            type: String,
+        },
+        ProxyFactoryClass: {
+            type: ObjectReferenceEntity,
+        },
+        ProxyClass: {
+            type: ObjectReferenceEntity,
+        },
         R: {
             type: Number,
         },
@@ -3256,6 +3266,9 @@ class ObjectEntity extends IEntity {
         /** @type {LinearColorEntity?} */ this.CommentColor;
         /** @type {Boolean?} */ this.bCommentBubbleVisible_InDetailsPanel;
         /** @type {Boolean?} */ this.bColorCommentBubble;
+        /** @type {String?} */ this.ProxyFactoryFunctionName;
+        /** @type {ObjectReferenceEntity?} */ this.ProxyFactoryClass;
+        /** @type {ObjectReferenceEntity?} */ this.ProxyClass;
         /** @type {Number?} */ this.R;
         /** @type {Number?} */ this.G;
         /** @type {ObjectReferenceEntity?} */ this.MaterialExpression;
@@ -3479,6 +3492,10 @@ class ObjectEntity extends IEntity {
     nodeDisplayName() {
         let input;
         switch (this.getType()) {
+            case Configuration.paths.asyncAction:
+                if (this.ProxyFactoryFunctionName) {
+                    return Utility.formatStringName(this.ProxyFactoryFunctionName)
+                }
             case Configuration.paths.componentBoundEvent:
                 return `${Utility.formatStringName(this.DelegatePropertyName)} (${this.ComponentPropertyName})`
             case Configuration.paths.createDelegate:
@@ -3764,6 +3781,7 @@ class ObjectEntity extends IEntity {
 
     nodeIcon() {
         switch (this.getType()) {
+            case Configuration.paths.asyncAction:
             case Configuration.paths.addDelegate:
             case Configuration.paths.createDelegate:
             case Configuration.paths.functionEntry:

js/Configuration.js

@@ -89,6 +89,7 @@ export default class Configuration {
     static paths = {
         addDelegate: "/Script/BlueprintGraph.K2Node_AddDelegate",
         ambientSound: "/Script/Engine.AmbientSound",
+        asyncAction: "/Script/BlueprintGraph.K2Node_AsyncAction",
         blueprint: "/Script/Engine.Blueprint",
         blueprintMapLibrary: "/Script/Engine.BlueprintMapLibrary",
         blueprintSetLibrary: "/Script/Engine.BlueprintSetLibrary",

js/entity/ObjectEntity.js

@@ -133,6 +133,15 @@ export default class ObjectEntity extends IEntity {
         bColorCommentBubble: {
             type: Boolean,
         },
+        ProxyFactoryFunctionName: {
+            type: String,
+        },
+        ProxyFactoryClass: {
+            type: ObjectReferenceEntity,
+        },
+        ProxyClass: {
+            type: ObjectReferenceEntity,
+        },
         R: {
             type: Number,
         },
@@ -322,6 +331,9 @@ export default class ObjectEntity extends IEntity {
         /** @type {LinearColorEntity?} */ this.CommentColor
         /** @type {Boolean?} */ this.bCommentBubbleVisible_InDetailsPanel
         /** @type {Boolean?} */ this.bColorCommentBubble
+        /** @type {String?} */ this.ProxyFactoryFunctionName
+        /** @type {ObjectReferenceEntity?} */ this.ProxyFactoryClass
+        /** @type {ObjectReferenceEntity?} */ this.ProxyClass
         /** @type {Number?} */ this.R
         /** @type {Number?} */ this.G
         /** @type {ObjectReferenceEntity?} */ this.MaterialExpression
@@ -545,6 +557,10 @@ export default class ObjectEntity extends IEntity {
     nodeDisplayName() {
         let input
         switch (this.getType()) {
+            case Configuration.paths.asyncAction:
+                if (this.ProxyFactoryFunctionName) {
+                    return Utility.formatStringName(this.ProxyFactoryFunctionName)
+                }
             case Configuration.paths.componentBoundEvent:
                 return `${Utility.formatStringName(this.DelegatePropertyName)} (${this.ComponentPropertyName})`
             case Configuration.paths.createDelegate:
@@ -830,6 +846,7 @@ export default class ObjectEntity extends IEntity {
 
     nodeIcon() {
         switch (this.getType()) {
+            case Configuration.paths.asyncAction:
             case Configuration.paths.addDelegate:
             case Configuration.paths.createDelegate:
             case Configuration.paths.functionEntry:

scss/style.scss

@@ -1,21 +1,9 @@
-@font-face {
-    font-family: "Roboto";
-    font-weight: lighter;
-    src: url("../font/roboto-light.woff2") format("woff2");
-}
-
 @font-face {
     font-family: "Roboto";
     font-weight: normal;
     src: url("../font/roboto-regular.woff2") format("woff2");
 }
 
-@font-face {
-    font-family: "Roboto";
-    font-weight: bold;
-    src: url("../font/roboto-bold.woff2") format("woff2");
-}
-
 @font-face {
     font-family: "Roboto";
     font-stretch: condensed;

scss/ueb-node.scss

@@ -76,8 +76,9 @@ ueb-node[data-selected="true"]>.ueb-node-border {
     min-height: 26px;
 }
 
-.ueb-node-style-operation .ueb-node-inputs {
+ueb-node.ueb-node-style-operation.ueb-node-has-inputs .ueb-node-inputs {
     align-self: center;
+    padding-right: 40px;
 }
 
 .ueb-node-style-operation:not(.ueb-node-is-variadic) .ueb-node-outputs {
@@ -99,8 +100,9 @@ ueb-blueprint[data-scrolling="false"][data-selecting="false"] ueb-node.ueb-node-
 .ueb-node-top {
     grid-area: top;
     color: #d0d0d0;
-    font-size: var(--ueb-font-size);
+    /* 1.030769 is to get an effective font size of 13.4px from --ueb-font-size which is 13 px */
-    font-weight: 600;
+    font-size: calc(1.030769 * var(--ueb-font-size));
+    font-weight: bold;
     line-height: 120%;
     white-space: nowrap;
 }
@@ -152,7 +154,7 @@ ueb-node.ueb-node-style-event .ueb-node-top {
 }
 
 .ueb-node-name:last-child {
-    padding-right: 16px;
+    padding-right: 26px;
 }
 
 .ueb-zoom--2 .ueb-node-name {
@@ -182,13 +184,19 @@ ueb-node[data-pure-function="true"] .ueb-node-name-symbol {
 .ueb-node-subtitle-text {
     padding-top: 1px;
     padding-right: 5px;
+    /* 0.946154 is to get an effective font size of 12.3px from --ueb-font-size which is 13 px */
+    font-size: calc(0.946154 * var(--ueb-font-size));
     font-weight: 100;
     font-style: italic;
     color: #a9b78f;
 }
 
-.ueb-node-has-inputs .ueb-node-inputs {
+.ueb-node-inputs {
     grid-area: input;
+}
+
+ueb-node.ueb-node-has-inputs .ueb-node-inputs {
+    padding-right: 20px;
     padding-left: 5px;
 }
 
@@ -201,10 +209,6 @@ ueb-node[data-pure-function="true"] .ueb-node-name-symbol {
     padding-right: 8px;
 }
 
-.ueb-node-has-inputs .ueb-node-inputs {
-    padding-right: 20px;
-}
-
 .ueb-node-variadic {
     grid-area: variadic;
     margin-top: 10px;