From b5742a72201c3ab0c6688e129831c81cfcd92b38 Mon Sep 17 00:00:00 2001 From: iobyte Date: Mon, 21 Aug 2023 21:07:32 +0000 Subject: [PATCH] trackeditor: fix graphic object properties combo box selection git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9124 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: c4ede791712d9e72849d55735959b58c7173926e Former-commit-id: 00d4aa8811108842a7672f6afeae26dbd17c5762 --- .../gui/properties/GraphicObjectProperties.java | 7 +++++-- src/tools/trackeditor/utils/Properties.java | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/tools/trackeditor/gui/properties/GraphicObjectProperties.java b/src/tools/trackeditor/gui/properties/GraphicObjectProperties.java index c5b074d0..d7c3dd2d 100644 --- a/src/tools/trackeditor/gui/properties/GraphicObjectProperties.java +++ b/src/tools/trackeditor/gui/properties/GraphicObjectProperties.java @@ -238,17 +238,20 @@ public class GraphicObjectProperties extends PropertyPanel fireTableCellUpdated(rowIndex, columnIndex); break; case OBJECT_INDEX: - if (value.equals("Unknown")) + { + String objectName = (String) value; + if ("Unknown".equals(objectName)) { datum.color = graphicObjects.get(rowIndex).getColor(); } else { - datum.color = getEditorFrame().getObjectColor(datum.name); + datum.color = getEditorFrame().getObjectColor(objectName); } fireTableCellUpdated(rowIndex, COLOR_INDEX); fireTableCellUpdated(rowIndex, columnIndex); break; + } case COLOR_INDEX: datum.color = (Integer) value; fireTableCellUpdated(rowIndex, columnIndex); diff --git a/src/tools/trackeditor/utils/Properties.java b/src/tools/trackeditor/utils/Properties.java index f06c2ffe..f6680aa1 100644 --- a/src/tools/trackeditor/utils/Properties.java +++ b/src/tools/trackeditor/utils/Properties.java @@ -34,7 +34,7 @@ public class Properties private static Properties instance = new Properties(); private Vector propertiesListeners = new Vector(); public final String title = "sd2-trackeditor"; - public final String version = "1.3.18"; + public final String version = "1.3.19"; private String path; private double imageScale = 1;