From b286313bd67f570ff4fec3626eb4964263b6125c Mon Sep 17 00:00:00 2001 From: Reino Ruusu Date: Mon, 13 May 2019 12:45:00 +0300 Subject: [PATCH] Reduction in size of hover label font to 9 pts. gitlab #44 Change-Id: I9f05a864242623792f72fa7071ab47a5f949d8eb --- .../src/org/simantics/maps/sg/MapScaleNode.java | 3 ++- .../network/ui/nodes/DistrictNetworkHoverInfoNode.java | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/org.simantics.district.maps/src/org/simantics/maps/sg/MapScaleNode.java b/org.simantics.district.maps/src/org/simantics/maps/sg/MapScaleNode.java index c2139955..e506e11d 100644 --- a/org.simantics.district.maps/src/org/simantics/maps/sg/MapScaleNode.java +++ b/org.simantics.district.maps/src/org/simantics/maps/sg/MapScaleNode.java @@ -16,6 +16,7 @@ import org.geotools.referencing.GeodeticCalculator; import org.opengis.referencing.FactoryException; import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.simantics.scenegraph.g2d.G2DNode; +import org.simantics.scenegraph.utils.DPIUtil; import org.simantics.scenegraph.utils.GridUtils; public class MapScaleNode extends G2DNode { @@ -47,7 +48,7 @@ public class MapScaleNode extends G2DNode { double offsetY = tr.getTranslateY(); g.setTransform(new AffineTransform()); - Font rulerFont = new Font("Tahoma", Font.PLAIN, 9); + Font rulerFont = new Font("Tahoma", Font.PLAIN, DPIUtil.upscale(9));; //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); g.setStroke(new BasicStroke(1)); diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkHoverInfoNode.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkHoverInfoNode.java index cb7053a0..b8a1617b 100644 --- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkHoverInfoNode.java +++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkHoverInfoNode.java @@ -9,13 +9,15 @@ import java.awt.geom.Rectangle2D; import java.util.List; import java.util.concurrent.atomic.AtomicReference; +import org.simantics.maps.MapScalingTransform; import org.simantics.scenegraph.g2d.G2DNode; +import org.simantics.scenegraph.utils.DPIUtil; import org.simantics.scl.runtime.Lists; import org.simantics.scl.runtime.tuple.Tuple3; public class DistrictNetworkHoverInfoNode extends G2DNode implements HoverSensitiveNode { - private static final Font FONT = new Font(Font.DIALOG, Font.PLAIN, 12); + private static final Font FONT = new Font("Tahoma", Font.PLAIN, (int)(DPIUtil.upscale(9) * MapScalingTransform.getScaleY() + 0.5)); private static final long serialVersionUID = 1L; -- 2.45.2