MPROMEditor now calls its columns "Opcode" and "muPC"

[Mograsim.git] / plugins / net.mograsim.logic.model.editor / src / net / mograsim / logic / model / editor / ui / EditorCanvas.java

diff --git a/plugins/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/ui/EditorCanvas.java b/plugins/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/ui/EditorCanvas.java
index aedaa48..5db38c0 100644 (file)
--- a/plugins/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/ui/EditorCanvas.java
+++ b/plugins/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/ui/EditorCanvas.java
@@ -2,7 +2,6 @@ package net.mograsim.logic.model.editor.ui;
 
 import java.util.Collection;
 
-import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.widgets.Composite;
 
 import net.haspamelodica.swt.helper.gcs.TranslatedGC;
@@ -10,7 +9,6 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
 import net.mograsim.logic.model.LogicUICanvas;
 import net.mograsim.logic.model.editor.Editor;
 import net.mograsim.logic.model.editor.handles.Handle;
-import net.mograsim.preferences.Preferences;
 
 //TODO: Remove Inheritance 
 public class EditorCanvas extends LogicUICanvas
@@ -19,7 +17,7 @@ public class EditorCanvas extends LogicUICanvas
 
        public EditorCanvas(Composite parent, int style, Editor editor)
        {
-               super(parent, style, editor.toBeEdited.submodel);
+               super(parent, style, editor.toBeEdited.submodel, editor.renderPrefs);
 
                handles = editor.handleManager.getHandles();
                editor.handleManager.addHandleAddedListener(h ->
@@ -37,13 +35,10 @@ public class EditorCanvas extends LogicUICanvas
                addZoomedRenderer(gc ->
                {
                        Rectangle visibleRegion = new Rectangle(-offX / zoom, -offY / zoom, gW / zoom, gH / zoom);
-                       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
 
                        TranslatedGC tgc = new TranslatedGC(gc, 0.0d, 0.0d, 1 / editor.toBeEdited.getSubmodelScale(), false);
-                       editor.toBeEdited.getOutlineRenderer().render(tgc, new Rectangle(-offX / zoom, -offY / zoom, gW / zoom, gH / zoom));
+                       editor.toBeEdited.getOutlineRenderer().render(tgc, renderPrefs,
+                                       new Rectangle(-offX / zoom, -offY / zoom, gW / zoom, gH / zoom));
 
                        handles.forEach(h -> h.render(gc, visibleRegion));
                });