From abd20c3293a1ea40df8d79d058a6d08fcbc5475f Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Wed, 25 Mar 2020 19:07:45 +0100 Subject: [PATCH] Changed how the SubmodelComponent decides whether to show its submodel --- .../model/model/components/submodels/SubmodelComponent.java | 2 +- .../src/net/mograsim/preferences/DefaultPreferences.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelComponent.java b/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelComponent.java index 61c97b38..f647cb74 100644 --- a/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelComponent.java +++ b/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelComponent.java @@ -362,7 +362,7 @@ public abstract class SubmodelComponent extends ModelComponent GCConfig conf = new GCConfig(gc); GeneralGC tgc = new TranslatedGC(gc, getPosX(), getPosY(), submodelScale, true); conf.reset(tgc); - double visibleRegionFillRatio = Math.max(getWidth() / visibleRegion.width, getHeight() / visibleRegion.height); + double visibleRegionFillRatio = getWidth() * getHeight() / (visibleRegion.width * visibleRegion.height); /** * If this {@link SubmodelComponent} fills at least this amount of the visible region vertically or horizontally, the submodel * starts to be visible. diff --git a/plugins/net.mograsim.preferences/src/net/mograsim/preferences/DefaultPreferences.java b/plugins/net.mograsim.preferences/src/net/mograsim/preferences/DefaultPreferences.java index 1f6820dd..67bb46a3 100644 --- a/plugins/net.mograsim.preferences/src/net/mograsim/preferences/DefaultPreferences.java +++ b/plugins/net.mograsim.preferences/src/net/mograsim/preferences/DefaultPreferences.java @@ -54,9 +54,9 @@ public class DefaultPreferences extends Preferences case "net.mograsim.logic.model.linewidth.wire.multibit": return 0.85; case "net.mograsim.logic.model.submodel.zoomalpha0": - return 0.8; + return 0.1; case "net.mograsim.logic.model.submodel.zoomalpha1": - return 0.9; + return 0.2; default: throw new IllegalArgumentException("Unknown double preference name: " + name); } -- 2.17.1