From 0468e55a8b3536a33208f5e24b31985b077ba745 Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Thu, 6 Jun 2019 21:26:09 +0200 Subject: [PATCH] Fixed visibleRegion calculation --- .../src/net/mograsim/logic/ui/LogicUICanvas.java | 2 +- .../mograsim/logic/ui/model/components/SubmodelComponent.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/LogicUICanvas.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/LogicUICanvas.java index 08dc4eb0..2465e469 100644 --- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/LogicUICanvas.java +++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/LogicUICanvas.java @@ -26,7 +26,7 @@ public class LogicUICanvas extends ZoomableCanvas this.model = model; LogicUIRenderer renderer = new LogicUIRenderer(model); - addZoomedRenderer(gc -> renderer.render(gc, new Rectangle(offX, offY, gW / zoom, gH / zoom))); + addZoomedRenderer(gc -> renderer.render(gc, new Rectangle(-offX / zoom, -offY / zoom, gW / zoom, gH / zoom))); model.addRedrawListener(this::redrawThreadsafe); addListener(SWT.MouseDown, this::mouseDown); diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SubmodelComponent.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SubmodelComponent.java index 5e5d18a6..72663a2a 100644 --- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SubmodelComponent.java +++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SubmodelComponent.java @@ -148,7 +148,7 @@ public abstract class SubmodelComponent extends GUIComponent if (submodelAlpha != 0) { gc.setAlpha(submodelAlpha); - renderer.render(tgc, visibleRegion.translate(-posX, -posY, 1 / submodelScale)); + renderer.render(tgc, visibleRegion.translate(posX / submodelScale, posY / submodelScale, 1 / submodelScale)); } if (labelAlpha != 0) { -- 2.17.1