FIX pasting of a rule in an empty group

Author: deepnight

docs/CHANGELOG.md

@@ -6,6 +6,7 @@
 - The online JSON documentation now shows references between UID fields.
 - Fixed a crash when updating an external CastleDB file
 - Fixed support for Aseprite 1.3.5 files
+- Fixed the pasting of a copied rule inside an empty group
 - CastleDB: fixed support for unique IDs in lists (note: nested lists in lists are not supported yet)
 
 # 1.5.3

src/electron.renderer/ui/FieldDefsForm.hx

@@ -275,7 +275,6 @@ class FieldDefsForm {
 			ui.modal.ContextMenu.attachTo_new(li, (ctx:ui.modal.ContextMenu)->{
 				ctx.addElement( Ctx_CopyPaster({
 					elementName: "field",
-					clipType: CFieldDef,
 					copy: ()->App.ME.clipboard.copyData(CFieldDef, fd.toJson()),
 					cut: ()->{
 						App.ME.clipboard.copyData(CFieldDef, fd.toJson());
@@ -286,6 +285,7 @@ class FieldDefsForm {
 						editor.ge.emit(FieldDefAdded(copy));
 						selectField(copy);
 					},
+					pasteAcceptedTypes: [CFieldDef],
 					duplicate: ()->{
 						var copy = duplicateFieldDef(fd);
 						editor.ge.emit( FieldDefAdded(copy) );

src/electron.renderer/ui/modal/ContextMenu.hx

@@ -38,10 +38,10 @@ typedef CtxActionSettings = {
 
 typedef CtxCopyPasterSettings = {
 	var elementName : String;
-	var clipType : ClipboardType;
 	var copy : Null< Void->Void >;
 	var cut : Null< Void->Void >;
 	var paste : Null< Void->Void >;
+	var pasteAcceptedTypes : Array<ClipboardType>;
 	var duplicate : Null< Void->Void >;
 	var delete : Null< Void->Void >;
 }
@@ -332,7 +332,16 @@ class ContextMenu extends ui.Modal {
 				addElement( Ctx_Action({
 					iconId : "paste",
 					cb : settings.paste,
-					enable: ()->settings.paste!=null && App.ME.clipboard.is(settings.clipType),
+					enable: ()->{
+						if( settings.paste==null )
+							return false;
+
+						for( type in settings.pasteAcceptedTypes )
+							if( App.ME.clipboard.is(type) )
+								return true;
+
+						return false;
+					},
 					tip : L._PasteAfter(settings.elementName),
 				}), jElement );
 

src/electron.renderer/ui/modal/panel/EditAllAutoLayerRules.hx

@@ -375,7 +375,7 @@ class EditAllAutoLayerRules extends ui.modal.Panel {
 					for(r in copy.rules)
 						invalidateRuleAndOnesBelow(r);
 				},
-				enable: ()->return App.ME.clipboard.is(CRuleGroup),
+				enable: ()->App.ME.clipboard.is(CRuleGroup),
 			});
 		});
 
@@ -645,18 +645,26 @@ class EditAllAutoLayerRules extends ui.modal.Panel {
 		ContextMenu.attachTo_new(jGroup, jGroupHeader, (ctx)->{
 			ctx.addElement( Ctx_CopyPaster({
 				elementName: "group",
-				clipType: CRuleGroup,
 				copy: ()->App.ME.clipboard.copyData(CRuleGroup, rg.toJson(li.def)),
 				cut: ()->{
 					App.ME.clipboard.copyData(CRuleGroup, rg.toJson(li.def));
 					deleteRuleGroup(rg, false);
 				},
 				paste: ()->{
-					var copy = ld.pasteRuleGroup(project, App.ME.clipboard, rg);
-					editor.ge.emit(LayerRuleGroupAdded(copy));
-					for(r in copy.rules)
-						invalidateRuleAndOnesBelow(r);
+					if( App.ME.clipboard.is(CRule) ) {
+						var copy = ld.pasteRule(project, rg, App.ME.clipboard);
+						lastRule = copy;
+						editor.ge.emit( LayerRuleAdded(copy) );
+						invalidateRuleAndOnesBelow(copy);
+					}
+					else if( App.ME.clipboard.is(CRuleGroup) ) {
+						var copy = ld.pasteRuleGroup(project, App.ME.clipboard, rg);
+						editor.ge.emit(LayerRuleGroupAdded(copy));
+						for(r in copy.rules)
+							invalidateRuleAndOnesBelow(r);
+					}
 				},
+				pasteAcceptedTypes: [CRuleGroup, CRule],
 				duplicate: ()-> {
 					var copy = ld.duplicateRuleGroup(project, rg);
 					editor.ge.emit( LayerRuleGroupAdded(copy) );
@@ -1050,7 +1058,6 @@ class EditAllAutoLayerRules extends ui.modal.Panel {
 		ContextMenu.attachTo_new(jRule, (ctx:ContextMenu)->{
 			ctx.addElement( Ctx_CopyPaster({
 				elementName: "rule",
-				clipType: CRule,
 
 				copy: ()->App.ME.clipboard.copyData(CRule, r.toJson(ld)),
 				cut: ()->{
@@ -1063,6 +1070,7 @@ class EditAllAutoLayerRules extends ui.modal.Panel {
 					editor.ge.emit( LayerRuleAdded(copy) );
 					invalidateRuleAndOnesBelow(copy);
 				},
+				pasteAcceptedTypes: [CRule],
 				duplicate: ()->{
 					var copy = ld.duplicateRule(project, rg, r);
 					lastRule = copy;

src/electron.renderer/ui/modal/panel/EditEntityDefs.hx

@@ -636,7 +636,6 @@ class EditEntityDefs extends ui.modal.Panel {
 				ContextMenu.attachTo_new(jEnt, (ctx:ContextMenu)->{
 					ctx.addElement( Ctx_CopyPaster({
 						elementName: "entity",
-						clipType: CEntityDef,
 						copy: ()->App.ME.clipboard.copyData(CEntityDef, ed.toJson(project)),
 						cut: ()->{
 							App.ME.clipboard.copyData(CEntityDef, ed.toJson(project));
@@ -647,6 +646,7 @@ class EditEntityDefs extends ui.modal.Panel {
 							editor.ge.emit(EntityDefAdded);
 							selectEntity(copy);
 						},
+						pasteAcceptedTypes: [CEntityDef],
 						duplicate: ()->{
 							var copy = project.defs.duplicateEntityDef(ed);
 							editor.ge.emit(EntityDefAdded);

src/electron.renderer/ui/modal/panel/EditEnumDefs.hx

@@ -221,7 +221,6 @@ class EditEnumDefs extends ui.modal.Panel {
 				ContextMenu.attachTo_new(jLi, (ctx:ContextMenu)->{
 					ctx.addElement( Ctx_CopyPaster({
 						elementName: "enum",
-						clipType: CLayerDef,
 
 						copy: ()->App.ME.clipboard.copyData(CEnumDef, ed.toJson(project)),
 						cut: ()->{
@@ -233,6 +232,7 @@ class EditEnumDefs extends ui.modal.Panel {
 							editor.ge.emit(EnumDefAdded);
 							selectEnum(copy);
 						},
+						pasteAcceptedTypes: [CLayerDef],
 						duplicate: ()->{
 							var copy = project.defs.duplicateEnumDef(ed);
 							editor.ge.emit(EnumDefAdded);

src/electron.renderer/ui/modal/panel/EditLayerDefs.hx

@@ -1024,7 +1024,6 @@ class EditLayerDefs extends ui.modal.Panel {
 			ContextMenu.attachTo_new(jLi, (ctx:ContextMenu)->{
 				ctx.addElement( Ctx_CopyPaster({
 					elementName: "layer",
-					clipType: CLayerDef,
 					copy: ()->App.ME.clipboard.copyData(CLayerDef, ld.toJson()),
 					cut: ()->{
 						App.ME.clipboard.copyData(CLayerDef, ld.toJson());
@@ -1037,6 +1036,7 @@ class EditLayerDefs extends ui.modal.Panel {
 							select(copy);
 						}
 					},
+					pasteAcceptedTypes: [CLayerDef],
 					duplicate: ()->{
 						var copy = project.defs.duplicateLayerDef(ld);
 						editor.ge.emit(LayerDefAdded);

src/electron.renderer/ui/modal/panel/EditTilesetDefs.hx

@@ -342,7 +342,6 @@ class EditTilesetDefs extends ui.modal.Panel {
 				ContextMenu.attachTo_new(jLi, (ctx:ContextMenu)->{
 					ctx.addElement( Ctx_CopyPaster({
 						elementName: "tileset",
-						clipType: CTilesetDef,
 						copy: td.isUsingEmbedAtlas() ? null : ()->App.ME.clipboard.copyData(CTilesetDef, td.toJson()),
 						cut: td.isUsingEmbedAtlas() ? null : ()->{
 							App.ME.clipboard.copyData(CTilesetDef, td.toJson());
@@ -353,6 +352,7 @@ class EditTilesetDefs extends ui.modal.Panel {
 							editor.ge.emit( TilesetDefAdded(copy) );
 							selectTileset(copy);
 						},
+						pasteAcceptedTypes: [CTilesetDef],
 						duplicate: td.isUsingEmbedAtlas() ? null : ()->{
 							var copy = project.defs.duplicateTilesetDef(td);
 							editor.ge.emit( TilesetDefAdded(copy) );