Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre-Charles David2021-06-22 14:19:51 +0000
committerPierre-Charles David2022-11-07 16:23:39 +0000
commit28ae3e58289f57326bbe7555db4f6d343d8c236d (patch)
tree70496f43a67697f5662588f5e4c0ab8c3b2d62f9
parent4f02cb4fe2ef56aba411b1eb9164711e1e9b7b09 (diff)
downloadorg.eclipse.sirius-v6.6.x.tar.gz
org.eclipse.sirius-v6.6.x.tar.xz
org.eclipse.sirius-v6.6.x.zip
[574390] Fix regression in font rendering on exportv6.6.x
This corresponds to https://git.eclipse.org/r/c/gmf-runtime/org.eclipse.gmf-runtime/+/182337 merged in GMF Runtime 1.13.1 Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=574390 Change-Id: Ifc3a7d62478d3d133b39cbd933cd71b985873c55 Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>
-rw-r--r--plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/render/SiriusGraphicsToGraphics2DAdaptor.java5
1 files changed, 3 insertions, 2 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 6ee79b915b..e579ee4f68 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, 2019 IBM Corporation and others.
+ * Copyright (c) 2004, 2021 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,7 +1060,8 @@ public class SiriusGraphicsToGraphics2DAdaptor extends Graphics implements Drawa
int height = fontInfo[0].getHeight();
- float fsize = height * 96.0f / 72.0f; // default display DPI / default DPI of AWT
+ int dpi = Integer.getInteger("org.eclipse.gmf.runtime.draw2d.ui.render.dpi", DisplayUtils.getDisplay().getDPI().x); //$NON-NLS-1$
+ float fsize = (float) height * (float) dpi / 72.0f; // default display DPI / default DPI of AWT
height = (int) fsize;
int style = fontInfo[0].getStyle();

Back to the top