diff --git a/engine/src/base/Selection.js b/engine/src/base/Selection.js index d7e3370c8..fe7685626 100644 --- a/engine/src/base/Selection.js +++ b/engine/src/base/Selection.js @@ -367,8 +367,12 @@ Wick.Selection = class extends Wick.Base { return 'soundasset'; } else if (selection.getSelectedObjects()[0] instanceof window.Wick.SVGAsset) { return 'svgasset'; + } else if(selection.getSelectedObjects()[0] instanceof window.Wick.FontAsset) { + return 'fontasset'; + } else if(selection.getSelectedObjects()[0] instanceof window.Wick.ClipAsset) { + return 'wickobjasset'; } else { - return 'multiassetmixed' + return 'unknown'; } } else { return 'unknown'; diff --git a/src/Editor/Panels/Inspector/Inspector.jsx b/src/Editor/Panels/Inspector/Inspector.jsx index fcbeecc77..7e7c28030 100644 --- a/src/Editor/Panels/Inspector/Inspector.jsx +++ b/src/Editor/Panels/Inspector/Inspector.jsx @@ -75,6 +75,8 @@ class Inspector extends Component { "multicanvas": this.renderMultiCanvas, "imageasset": this.renderAsset, "soundasset": this.renderAsset, + "fontasset": this.renderAsset, + "wickobjasset": this.renderAsset, "multiassetmixed": this.renderAsset, "multisoundasset": this.renderAsset, "multiimageasset": this.renderAsset, @@ -88,7 +90,7 @@ class Inspector extends Component { 'convertSelectionToButton': ["path", "text", "image", "multipath", "multiclip", "multicanvas"], 'convertSelectionToClip': ["path", "text", "image", "multipath", "multiclip", "multicanvas"], 'editTimeline': ["clip", "button"], - 'addAssetToCanvas': ["imageasset"], + 'addAssetToCanvas': ["imageasset", "wickobjasset"], // 'alignX': [ "multipath"] // H.A. } @@ -111,6 +113,8 @@ class Inspector extends Component { "multicanvas": "Multi-Canvas", "imageasset": "Image Asset", "soundasset": "Sound Asset", + "fontasset": "Font Asset", + "wickobjasset": "WickObject Asset", "multiassetmixed": "Multi-Asset", "multisoundasset": "Multi-Asset Sound", "multiimageasset": "Multi-Asset Image", diff --git a/src/Editor/Panels/MobileContainer/MobileInspector/MobileInspector.jsx b/src/Editor/Panels/MobileContainer/MobileInspector/MobileInspector.jsx index d471c0ffd..f4f46f3ea 100644 --- a/src/Editor/Panels/MobileContainer/MobileInspector/MobileInspector.jsx +++ b/src/Editor/Panels/MobileContainer/MobileInspector/MobileInspector.jsx @@ -69,7 +69,7 @@ class MobileInspector extends Component { 'convertSelectionToButton': ["path", "text", "image", "multipath", "multiclip", "multicanvas"], 'convertSelectionToClip': ["path", "text", "image", "multipath", "multiclip", "multicanvas"], 'editTimeline': ["clip", "button"], - 'addAssetToCanvas': ["imageasset"], + 'addAssetToCanvas': ["imageasset", "wickobjasset"], } /** @@ -91,6 +91,8 @@ class MobileInspector extends Component { "multicanvas": "Multi-Canvas", "imageasset": "Image Asset", "soundasset": "Sound Asset", + "fontasset": "Font Asset", + "wickobjasset": "WickObject Asset", "multiassetmixed": "Multi-Asset", "multisoundasset": "Multi-Asset Sound", "multiimageasset": "Multi-Asset Image", @@ -127,6 +129,8 @@ class MobileInspector extends Component { "multicanvas": ['transform'], "imageasset": ['assetSettings', 'name'], "soundasset": ['assetSettings', 'name'], + "fontasset": [], + "wickobjasset": [], "multiassetmixed": ['assetSettings'], "multisoundasset": ['assetSettings'], "multiimageasset": ['assetSettings'],