Fixed edge arrows to always be rendered above the edge

[simantics/district.git] / org.simantics.district.network.ui / src / org / simantics / district / network / ui / nodes / DistrictNetworkHoverInfoNode.java

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 24b7f5898c0dd0a06970ce1b28147c1b623120d2..316370bd2911042683593fb0a1950825517c5859 100644 (file)
--- 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
@@ -14,7 +14,6 @@ import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.ToIntFunction;
 
 import org.simantics.district.network.ui.styles.DistrictNetworkHoverInfoStyle;
-import org.simantics.maps.MapScalingTransform;
 import org.simantics.scenegraph.INode;
 import org.simantics.scenegraph.NodeException;
 import org.simantics.scenegraph.ParentNode;
@@ -38,10 +37,7 @@ public class DistrictNetworkHoverInfoNode extends G2DNode implements HoverSensit
 
     private List<Tuple3> labels;
 
-    private Font font = new Font(
-            Font.SANS_SERIF,
-            Font.PLAIN,
-            (int)(DPIUtil.upscale(9) * MapScalingTransform.getScaleY() + 0.5));
+    private Font font = new Font(Font.SANS_SERIF, Font.PLAIN, DPIUtil.upscale(14));
 
     @SuppressWarnings("unused")
     private Point2D origin;
@@ -71,7 +67,7 @@ public class DistrictNetworkHoverInfoNode extends G2DNode implements HoverSensit
     public void renderDeferred(Graphics2D g) {
         if (!hover || activeNode.get() == null)
             return;
-        if (labels.isEmpty() || mousePosition == null)
+        if (labels == null || labels.isEmpty() || mousePosition == null)
             return;
         AffineTransform ot = g.getTransform();
         Font of = g.getFont();
@@ -90,9 +86,8 @@ public class DistrictNetworkHoverInfoNode extends G2DNode implements HoverSensit
 
         g.translate(mousePosition.getX(), mousePosition.getY());
         //g.translate(origin.getX(), origin.getY());
-        double scale = DPIUtil.upscale( 1.25 / GeometryUtils.getScale(g.getTransform()) );
+        double scale = 1.0 / GeometryUtils.getScale(g.getTransform());
         g.scale(scale, scale);
-
         g.setFont(font);
 
         FontMetrics fm = g.getFontMetrics();