Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Redor2019-11-08 16:27:44 +0000
committerLaurent Redor2019-11-12 07:34:17 +0000
commitdc038cde6d2c184c0b18b202b600654860417ecd (patch)
tree55c3db508b8328e181dda0f689ff499186fa9e99
parent0a24c0d142443a2388692f1ab5d64ac410d7e8a8 (diff)
downloadorg.eclipse.sirius-dc038cde6d2c184c0b18b202b600654860417ecd.tar.gz
org.eclipse.sirius-dc038cde6d2c184c0b18b202b600654860417ecd.tar.xz
org.eclipse.sirius-dc038cde6d2c184c0b18b202b600654860417ecd.zip
[552851] Fix font problem when exporting image
This commit is a report of the GMF fix of bug 312723 [1]. [1] https://bugs.eclipse.org/bugs/show_bug.cgi?id=312723 Bug: 552851 Change-Id: I2ff8b8e9e140e09980f2f10aa69cc263d3ad96f4 Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>
-rw-r--r--plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/render/SiriusGraphicsToGraphics2DAdaptor.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/render/SiriusGraphicsToGraphics2DAdaptor.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/render/SiriusGraphicsToGraphics2DAdaptor.java
index 220cb7df50..6ee79b915b 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/render/SiriusGraphicsToGraphics2DAdaptor.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/render/SiriusGraphicsToGraphics2DAdaptor.java
@@ -1,5 +1,5 @@
/******************************************************************************
- * Copyright (c) 2004, 2016 IBM Corporation and others.
+ * Copyright (c) 2004, 2019 IBM Corporation and others.
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
@@ -1060,8 +1060,8 @@ public class SiriusGraphicsToGraphics2DAdaptor extends Graphics implements Drawa
int height = fontInfo[0].getHeight();
- float fsize = (float) height * (float) DisplayUtils.getDisplay().getDPI().x / 72.0f;
- height = Math.round(fsize);
+ float fsize = height * 96.0f / 72.0f; // default display DPI / default DPI of AWT
+ height = (int) fsize;
int style = fontInfo[0].getStyle();
boolean bItalic = (style & SWT.ITALIC) == SWT.ITALIC;

Back to the top