Update for 0.04.4d to fix the Edit > Delete menu option

Retera · Oct 31, 2022 · a2f2f71 · a2f2f71
1 parent 0cfbf3c
commit a2f2f71
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/craft3data/src/com/hiveworkshop/wc3/units/objectdata/MutableObjectData.java b/craft3data/src/com/hiveworkshop/wc3/units/objectdata/MutableObjectData.java
@@ -856,7 +856,7 @@ public static String getEditorMetaDataDisplayKey(int level, final GameObject met
 			if (upgradeExtensionLevel > 0) {
 				metaDataName += Integer.toString(upgradeExtensionLevel);
 			}
-		} else if (repeats && index == -1) {
+		} else if (repeats && (index == -1 || repeatCount >= 10)) {
 			if (level == 0) {
 				level = 1;
 			}

diff --git a/matrixeater/src/com/matrixeater/src/MainPanel.java b/matrixeater/src/com/matrixeater/src/MainPanel.java
@@ -369,6 +369,21 @@ public void actionPerformed(final ActionEvent e) {
 		}
 	};
 	AbstractAction deleteAction = new AbstractAction("Delete") {
+		@Override
+		public void actionPerformed(final ActionEvent e) {
+			final ModelPanel mpanel = currentModelPanel();
+			if (mpanel != null) {
+				if (animationModeState) {
+					timeSliderPanel.deleteSelectedKeyframes();
+				} else {
+					mpanel.getUndoManager()
+							.pushAction(mpanel.getModelEditorManager().getModelEditor().deleteSelectedComponents());
+				}
+			}
+			repaintSelfAndChildren(mpanel);
+		}
+	};
+	AbstractAction deleteHotkeyAction = new AbstractAction("Delete") {
 		@Override
 		public void actionPerformed(final ActionEvent e) {
 			final ModelPanel mpanel = currentModelPanel();
@@ -2137,7 +2152,7 @@ private void linkActions(final JComponent root) {
 		root.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke("control Y"),
 				"Redo");
 
-		root.getActionMap().put("Delete", deleteAction);
+		root.getActionMap().put("Delete", deleteHotkeyAction);
 		root.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke("DELETE"), "Delete");
 
 		root.getActionMap().put("CloneSelection", cloneAction);