X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.diagram%2Fsrc%2Forg%2Fsimantics%2Fdiagram%2Felements%2FTextNode.java;h=b407796e7b814736614dc620e0274fc4987b3aa1;hp=96cd573cc626860a43d51775d7cb20106ca98a3b;hb=d1860919acc0768cf723960406d2bea078bcb621;hpb=a2a42428426818a7498d5a1705603fb8d3a8a95a

diff --git a/bundles/org.simantics.diagram/src/org/simantics/diagram/elements/TextNode.java b/bundles/org.simantics.diagram/src/org/simantics/diagram/elements/TextNode.java
index 96cd573cc..b407796e7 100644
--- a/bundles/org.simantics.diagram/src/org/simantics/diagram/elements/TextNode.java
+++ b/bundles/org.simantics.diagram/src/org/simantics/diagram/elements/TextNode.java
@@ -673,6 +673,7 @@ public class TextNode extends G2DNode implements IDynamicSelectionPainterNode, L
 
         // PDF 
         PdfWriter writer = (PdfWriter) g.getRenderingHint(G2DPDFRenderingHints.KEY_PDF_WRITER);
+        boolean isRenderingPdf = writer != null;
         boolean isPdfField = false;
         String fieldName = null;
         if (writer != null) {
@@ -702,7 +703,7 @@ public class TextNode extends G2DNode implements IDynamicSelectionPainterNode, L
 
                 // Base text
                 g.setColor(color);
-                renderText(g, xOffset);
+                renderText(g, xOffset, isRenderingPdf);
 
                 Shape clip = g.getClip();
 
@@ -715,8 +716,11 @@ public class TextNode extends G2DNode implements IDynamicSelectionPainterNode, L
                         g.setColor(SELECTION_BACKGROUND_COLOR);
                         g.fill(selShape);
                         g.setColor(Color.WHITE);
-                        //line.layout.draw(g, 0, 0);
-                        g.drawString(line.getText(), 0, 0);
+                        // #6459: render as text in PDF and paths on screen
+                        if (isRenderingPdf)
+                            g.drawString(line.getText(), 0, 0);
+                        else
+                            line.layout.draw(g, 0, 0);
                         line.translateInv(g, xOffset, 0);
                     }
                 }
@@ -732,7 +736,7 @@ public class TextNode extends G2DNode implements IDynamicSelectionPainterNode, L
 
                 if (renderText) {
                     g.setColor(color);
-                    renderText(g, 0);
+                    renderText(g, 0, isRenderingPdf);
                 }
 
             }
@@ -883,11 +887,14 @@ public class TextNode extends G2DNode implements IDynamicSelectionPainterNode, L
           }
         }
     }
-    private void renderText(Graphics2D g, float xOffset) {
+    private void renderText(Graphics2D g, float xOffset, boolean isRenderingPdf) {
         //g.draw(tightBoundsCache); // DEBUG
         for (Line line : lines) {
-            //line.layout.draw(g, line.alignedPosX + xOffset, line.alignedPosY);
-            g.drawString(line.getText(), line.alignedPosX + xOffset, line.alignedPosY);
+            // #6459: render as text in PDF and paths on screen
+            if (isRenderingPdf)
+                g.drawString(line.getText(), line.alignedPosX + xOffset, line.alignedPosY);
+            else
+                line.layout.draw(g, line.alignedPosX + xOffset, line.alignedPosY);
             //g.draw(line.abbox); // DEBUG
         }
     }