X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.logic.model.editor%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Feditor%2Fui%2FEditorCanvas.java;h=5db38c08be76e0b95dccd0b8345a950a61093be4;hb=HEAD;hp=aedaa481f4343b7831f07171c037ea7ef4e4eed1;hpb=58babf45ae7d259a296656451d796dbe601377a4;p=Mograsim.git 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 aedaa481..5db38c08 100644 --- 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)); });