BDC/diy-layout-creator
2
0
Fork 0
mirror of https://github.com/bancika/diy-layout-creator synced 2026-11-12 02:02:16 +10:00
Code Issues Packages Projects Releases Wiki Activity

Better component value render in explorer

Browse Source
This commit is contained in:
Bane Stojkovic
2022-12-12 21:57:17 +01:00
parent c7d5fe3cf4
commit f181109ac7
1 changed files with 41 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-swing/src/org/diylc/swing/plugins/explorer/ExplorerPane.java
+21 -5
View File
@@ -345,7 +345,8 @@ public class ExplorerPane extends JPanel {
private static class ComponentListCellRenderer implements ListCellRenderer<IDIYComponent<?>> { private static class ComponentListCellRenderer implements ListCellRenderer<IDIYComponent<?>> {
// private static Color[] layerColors = new Color[] { Color.gray, Color.decode("#ff6363"), Color.decode("#293462"), Color.decode("#138588"), // private static Color[] layerColors = new Color[] { Color.gray, Color.decode("#ff6363"),
// Color.decode("#293462"), Color.decode("#138588"),
// Color.decode("#c0ca03"), Color.decode("#990000") }; // Color.decode("#c0ca03"), Color.decode("#990000") };
protected DefaultListCellRenderer defaultRenderer = new DefaultListCellRenderer(); protected DefaultListCellRenderer defaultRenderer = new DefaultListCellRenderer();
@@ -353,8 +354,7 @@ public class ExplorerPane extends JPanel {
private Map<String, ComponentType> componentTypes; private Map<String, ComponentType> componentTypes;
public ComponentListCellRenderer(Map<String, List<ComponentType>> componentTypeMap) { public ComponentListCellRenderer(Map<String, List<ComponentType>> componentTypeMap) {
this.componentTypes = componentTypeMap.values().stream() this.componentTypes = componentTypeMap.values().stream().flatMap(x -> x.stream())
.flatMap(x -> x.stream())
.collect(Collectors.toMap(x -> x.getInstanceClass().getCanonicalName(), x -> x)); .collect(Collectors.toMap(x -> x.getInstanceClass().getCanonicalName(), x -> x));
} }
@@ -369,8 +369,24 @@ public class ExplorerPane extends JPanel {
int layerId = (int) Math.round(componentType.getZOrder()); int layerId = (int) Math.round(componentType.getZOrder());
String valueForDisplay = value.getValueForDisplay();
renderer.setText(String.format("<html><font color='#c0c0c0'>[L%s]</font> %s (<font color='#666666'>%s</font>)</html>", layerId, value.getName(), value.getValueForDisplay())); if (isSelected) {
if (valueForDisplay == null || valueForDisplay.trim().isEmpty()) {
renderer.setText(String.format("[L%s] %s", layerId, value.getName()));
} else {
renderer
.setText(String.format("[L%s] %s (%s)", layerId, value.getName(), valueForDisplay));
}
} else {
if (valueForDisplay == null || valueForDisplay.trim().isEmpty()) {
renderer.setText(String.format("<html><font color='#c0c0c0'>[L%s]</font> %s</html>",
layerId, value.getName()));
} else {
renderer.setText(String.format(
"<html><font color='#c0c0c0'>[L%s]</font> %s (<font color='#666666'>%s</font>)</html>",
layerId, value.getName(), valueForDisplay));
}
}
return renderer; return renderer;
} }