Caching systemFont as well

Author: arunjose696

bundles/org.eclipse.swt/Eclipse SWT Tests/win32/org/eclipse/swt/widgets/ControlWin32Tests.java

@@ -48,7 +48,7 @@ public void testScaleFontCorrectlyInNoAutoScaleSzenario() {
 		DPIUtil.setMonitorSpecificScaling(false);
 		Display display = Display.getDefault();
 
-		assertTrue("Autoscale property is not set to true", display.isRescalingAtRuntime());
+		assertFalse("Autoscale property is not set to true", display.isRescalingAtRuntime());
 		int scalingFactor = 2;
 		FontComparison fontComparison = updateFont(scalingFactor);
 		assertEquals("Font height in pixels is not adjusted according to the scale factor",
@@ -58,14 +58,27 @@ public void testScaleFontCorrectlyInNoAutoScaleSzenario() {
 	@Test
 	public void testDoNotScaleFontCorrectlyInNoAutoScaleSzenarioWithLegacyFontRegistry() {
 		DPIUtil.setMonitorSpecificScaling(false);
+		String originalValue = System.getProperty("swt.fontRegistry");
 		System.setProperty("swt.fontRegistry", "LEGACY");
-		Display display = Display.getDefault();
+		try {
+			Display display = Display.getDefault();
+
+			assertFalse("Autoscale property is not set to false", display.isRescalingAtRuntime());
+			int scalingFactor = 2;
+			FontComparison fontComparison = updateFont(scalingFactor);
+			assertEquals("Font height in pixels is different when setting the same font again",
+					fontComparison.originalFontHeight, fontComparison.currentFontHeight);
+
+
+		}
+		finally {
+			if (originalValue != null) {
+		        System.setProperty("swt.fontRegistry", originalValue);
+		    } else {
+		        System.clearProperty("swt.fontRegistry");
+		    }
+		}
 
-		assertFalse("Autoscale property is not set to false", display.isRescalingAtRuntime());
-		int scalingFactor = 2;
-		FontComparison fontComparison = updateFont(scalingFactor);
-		assertEquals("Font height in pixels is different when setting the same font again",
-				fontComparison.originalFontHeight, fontComparison.currentFontHeight);
 	}
 
 	@Test

bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/ScalingSWTFontRegistry.java

@@ -78,7 +78,13 @@ private class ScaledSystemFontContainer extends ScaledFontContainer {
 		@Override
 		protected Font createFont(int zoom) {
 			long newHandle = createSystemFontHandle(zoom);
-			return Font.win32_new(device, newHandle, zoom);
+
+			Font systemFont  = Font.win32_new(device, newHandle, zoom);
+			FontData clonedFontData = systemFont.getFontData()[0];
+			if (!customFontsKeyMap.containsKey(clonedFontData)) {
+				customFontsKeyMap.put(clonedFontData, systemFontContainer);
+			}
+			return systemFont;
 		}
 
 		private long createSystemFontHandle(int zoom) {