Merge "Reading background color of a ICanvasContext with SCL"

[simantics/platform.git] / bundles / org.simantics.g2d / src / org / simantics / g2d / utils / FontHelper.java

diff --git a/bundles/org.simantics.g2d/src/org/simantics/g2d/utils/FontHelper.java b/bundles/org.simantics.g2d/src/org/simantics/g2d/utils/FontHelper.java
index f5bfcfdf438eaf2009cb5c5ef25d39c72d17916f..98d5c78f664759653e2a5ffad20cbf7600da24af 100644 (file)
--- a/bundles/org.simantics.g2d/src/org/simantics/g2d/utils/FontHelper.java
+++ b/bundles/org.simantics.g2d/src/org/simantics/g2d/utils/FontHelper.java
@@ -1,47 +1,46 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2010 Association for Decentralized Information Management\r
- * in Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.g2d.utils;\r
-\r
-import java.awt.Font;\r
-import java.awt.Toolkit;\r
-\r
-import org.eclipse.jface.resource.FontRegistry;\r
-import org.eclipse.swt.graphics.FontData;\r
-import org.eclipse.ui.PlatformUI;\r
-\r
-public final class FontHelper {\r
-\r
-    /**\r
-     * @return\r
-     * @throws IllegalStateException if there's no eclipse workbench context\r
-     *         available\r
-     */\r
-    public static FontRegistry getCurrentThemeFontRegistry() {\r
-        return PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getFontRegistry();\r
-    }\r
-\r
-    public static java.awt.Font toAwt(FontRegistry registry, String themeFontId) {\r
-        FontData fd = registry.getFontData(themeFontId)[0];\r
-        return toAwt(fd);\r
-    }\r
-\r
-    public static java.awt.Font toAwt(FontData fd) {\r
-        int resolution = Toolkit.getDefaultToolkit().getScreenResolution();\r
-        int awtFontSize = (int) Math.round((double) fd.getHeight() * resolution / 72.0);\r
-        // The style constants for SWT and AWT map exactly, and since they are int constants, they should\r
-        // never change. So, the SWT style is passed through as the AWT style.\r
-        Font font = new java.awt.Font(fd.getName(), fd.getStyle(), awtFontSize);\r
-//        System.out.println("awt font: " + font);\r
-        return font;\r
-    }\r
-\r
-}\r
+/*******************************************************************************
+ * Copyright (c) 2007, 2010 Association for Decentralized Information Management
+ * in Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.g2d.utils;
+
+import java.awt.Font;
+
+import org.eclipse.jface.resource.FontRegistry;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.ui.PlatformUI;
+import org.simantics.utils.ui.SWTDPIUtil;
+
+public final class FontHelper {
+
+    /**
+     * @return
+     * @throws IllegalStateException if there's no eclipse workbench context
+     *         available
+     */
+    public static FontRegistry getCurrentThemeFontRegistry() {
+        return PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getFontRegistry();
+    }
+
+    public static java.awt.Font toAwt(FontRegistry registry, String themeFontId) {
+        FontData fd = registry.getFontData(themeFontId)[0];
+        return toAwt(fd);
+    }
+
+    public static java.awt.Font toAwt(FontData fd) {
+        int awtFontSize = SWTDPIUtil.upscaleSwt(fd.getHeight());
+        // The style constants for SWT and AWT map exactly, and since they are int constants, they should
+        // never change. So, the SWT style is passed through as the AWT style.
+        Font font = new java.awt.Font(fd.getName(), fd.getStyle(), awtFontSize);
+//        System.out.println("awt font: " + font);
+        return font;
+    }
+
+}