X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2FLogicUICanvas.java;h=2c82d133a205fd11d2ddaef7c2c0171309096bce;hb=d6702bcad356a28bc6c2eb0574d5cecdf536aabc;hp=609bf74fca3af0c7aa36268a95fabcc541eca972;hpb=2f2269e36940705063adba3ff89ed7830c0b2edf;p=Mograsim.git diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUICanvas.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUICanvas.java index 609bf74f..2c82d133 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUICanvas.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUICanvas.java @@ -48,7 +48,7 @@ public class LogicUICanvas extends ZoomableCanvas LogicUIRenderer renderer = new LogicUIRenderer(model); addZoomedRenderer(gc -> { - Color background = Preferences.current().getColor("net.mograsim.logic.ui.color.background"); + Color background = Preferences.current().getColor("net.mograsim.logic.model.color.background"); if (background != null) setBackground(background);// this.setBackground, not gc.setBackground to have the background fill the canvas renderer.render(gc, new Rectangle(-offX / zoom, -offY / zoom, gW / zoom, gH / zoom)); @@ -163,7 +163,8 @@ public class LogicUICanvas extends ZoomableCanvas private void addComponentSelectorItems(List componentsByItemIndex, String base, Combo componentSelector, ViewModel model) { - for (GUIComponent c : model.getComponentsByName().values()) + model.getComponentsByName().values().stream().sorted((c1, c2) -> c1.name.compareTo(c2.name)).forEach(c -> + { if (!(c instanceof WireCrossPoint || c instanceof SubmodelInterface)) { String item = base + c.name; @@ -172,6 +173,6 @@ public class LogicUICanvas extends ZoomableCanvas if (c instanceof SubmodelComponent) addComponentSelectorItems(componentsByItemIndex, item + " -> ", componentSelector, ((SubmodelComponent) c).submodel); } + }); } - } \ No newline at end of file