From 59794c0fc634d6833d60649295ab722aef68d00b Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Tue, 4 Jun 2019 07:53:35 +0200 Subject: [PATCH] Updated to newer SWTHelper version fixing a problem in GCConfig --- SWTHelper | 2 +- .../logic/ui/model/components/SubmodelComponent.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SWTHelper b/SWTHelper index 7d47333e..0fbb7809 160000 --- a/SWTHelper +++ b/SWTHelper @@ -1 +1 @@ -Subproject commit 7d47333ed050416991e97421ece07965edb3d7f2 +Subproject commit 0fbb780939a1101125c194bb150cf47387993d6b 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 eca0df69..e62bea62 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 @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; -import net.haspamelodica.swt.helper.gcs.GCDefaultConfig; +import net.haspamelodica.swt.helper.gcs.GCConfig; import net.haspamelodica.swt.helper.gcs.GeneralGC; import net.haspamelodica.swt.helper.gcs.TranslatedGC; import net.haspamelodica.swt.helper.swtobjectwrappers.Font; @@ -139,7 +139,7 @@ public class SubmodelComponent extends GUIComponent double posX = getBounds().x; double posY = getBounds().y; - GCDefaultConfig conf = new GCDefaultConfig(gc); + GCConfig conf = new GCConfig(gc); TranslatedGC tgc = new TranslatedGC(gc, posX, posY, submodelScale, true); conf.reset(tgc); double visibleRegionFillRatio = Math.max(getBounds().width / visibleRegion.width, getBounds().height / visibleRegion.height); @@ -148,7 +148,7 @@ public class SubmodelComponent extends GUIComponent // we need to take the old alpha into account to support nested submodules better. int oldAlpha = gc.getAlpha(); gc.setAlpha(Math.max(0, Math.min(255, (int) (oldAlpha * alphaFactor)))); - renderer.render(tgc, visibleRegion.translate(posX, posY, submodelScale)); + renderer.render(tgc, visibleRegion.translate(-posX, -posY, 1 / submodelScale)); gc.setAlpha(Math.max(0, Math.min(255, (int) (oldAlpha * (1 - alphaFactor))))); Font oldFont = gc.getFont(); Font labelFont = new Font(oldFont.getName(), 6, oldFont.getStyle()); -- 2.17.1