New FontData Constructor to create a deep copy

bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/FontData.java

@@ -186,6 +186,26 @@ public FontData(String string) {
 	}
 }
 
+/**
+ * Constructs a new FontData copy
+ *
+ * @param fontData the FondData object for which copy is needed to be made
+ *
+ * @exception IllegalArgumentException
+ * <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the argument is null</li>
+ * </ul>
+ * @since 3.130
+ */
+public FontData(FontData fontData) {
+	if (fontData == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+
+	setName(fontData.name);
+	setHeight(fontData.height);
+	setStyle(fontData.style);
+	this.nsName = fontData.nsName;
+}
+
 /**
  * Constructs a new font data given a font name,
  * the height of the desired font in points,

bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/FontData.java

@@ -184,6 +184,25 @@ public FontData(String string) {
 	}
 }
 
+/**
+ * Constructs a new FontData copy
+ *
+ * @param fontData the FondData object for which copy is needed to be made
+ *
+ * @exception IllegalArgumentException
+ * <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the argument is null</li>
+ * </ul>
+ * @since 3.130
+ */
+public FontData(FontData fontData) {
+	if (fontData == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+
+	setName(fontData.name);
+	setHeight(fontData.height);
+	setStyle(fontData.style);
+}
+
 /**
  * Constructs a new font data given a font name,
  * the height of the desired font in points,

bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Font.java

@@ -103,7 +103,7 @@ public Font(Device device, FontData fd) {
 	super(device);
 	if (fd == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
 	this.zoom = DPIUtil.getNativeDeviceZoom();
-	this.fontData = new FontData(fd.toString());
+	this.fontData = new FontData(fd);
 	this.fontHeight = fd.height;
 	init();
 }
@@ -112,7 +112,7 @@ private Font(Device device, FontData fd, int zoom) {
 	super(device);
 	if (fd == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
 	this.zoom = zoom;
-	this.fontData = new FontData(fd.toString());
+	this.fontData = new FontData(fd);
 	this.fontHeight = fd.height;
 	init();
 }
@@ -151,7 +151,7 @@ public Font(Device device, FontData[] fds) {
 	}
 	this.zoom = DPIUtil.getNativeDeviceZoom();
 	FontData fd = fds[0];
-	this.fontData = new FontData(fd.toString());
+	this.fontData = new FontData(fd);
 	this.fontHeight = fd.height;
 	init();
 }

bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontData.java

@@ -240,6 +240,52 @@ public FontData(String string) {
 	}
 }
 
+
+/**
+ * Constructs a new FontData copy
+ *
+ * @param fontData the FondData object for which copy is needed to be made
+ *
+ * @exception IllegalArgumentException
+ * <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the argument is null</li>
+ * </ul>
+ * @since 3.130
+ */
+public FontData(FontData fontData) {
+	if (fontData == null)
+		SWT.error(SWT.ERROR_NULL_ARGUMENT);
+
+	if (fontData.data != null) {
+		LOGFONT newData = new LOGFONT();
+		setHeight(fontData.getHeightF());
+		newData.lfHeight = fontData.data.lfHeight;
+		newData.lfWidth = fontData.data.lfWidth;
+		newData.lfEscapement = fontData.data.lfEscapement;
+		newData.lfOrientation = fontData.data.lfOrientation;
+		newData.lfWeight = fontData.data.lfWeight;
+		newData.lfItalic = fontData.data.lfItalic;
+		newData.lfUnderline = fontData.data.lfUnderline;
+		newData.lfStrikeOut = fontData.data.lfStrikeOut;
+		newData.lfCharSet = fontData.data.lfCharSet;
+		newData.lfOutPrecision = fontData.data.lfOutPrecision;
+		newData.lfClipPrecision = fontData.data.lfClipPrecision;
+		newData.lfQuality = fontData.data.lfQuality;
+		newData.lfPitchAndFamily = fontData.data.lfPitchAndFamily;
+
+		// Deep copy of the char array lfFaceName
+		if (fontData.data.lfFaceName != null) {
+			newData.lfFaceName = new char[fontData.data.lfFaceName.length];
+			System.arraycopy(fontData.data.lfFaceName, 0, newData.lfFaceName, 0, fontData.data.lfFaceName.length);
+		}
+
+		this.data = newData;
+	} else {
+		this.data = null;
+	}
+}
+
+
 /**
  * Constructs a new font data given a font name,
  * the height of the desired font in points,

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

@@ -77,7 +77,7 @@ public Font getFont(long fontHandle, int zoom) {
 	}
 
 	private Font registerFont(FontData fontData, Font font) {
-		FontData clonedFontData = new FontData(fontData.toString());
+		FontData clonedFontData = new FontData(fontData);
 		fontsMap.put(clonedFontData, font);
 		return font;
 	}

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

@@ -128,7 +128,7 @@ public Font getFont(FontData fontData, int zoom) {
 		if (customFontsKeyMap.containsKey(fontData)) {
 			container = customFontsKeyMap.get(fontData);
 		} else {
-			FontData clonedFontData = new FontData(fontData.toString());
+			FontData clonedFontData = new FontData(fontData);
 			container = new ScaledCustomFontContainer(clonedFontData);
 			customFontsKeyMap.put(clonedFontData, container);
 		}

tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_FontData.java

@@ -90,6 +90,15 @@ public void test_ConstructorLjava_lang_StringII() {
 	}
 }
 
+@Test
+public void test_ConstructorLjava_lang_FontData() {
+	// Test new FontData(FontData fontData)
+	FontData fd = new FontData(SwtTestUtil.testFontName, 30, SWT.ITALIC);
+	FontData reconstructedFontDataFromCopyConstructor = new FontData(fd);
+	assertEquals(fd, reconstructedFontDataFromCopyConstructor);
+	assertEquals(fd.hashCode(), reconstructedFontDataFromCopyConstructor.hashCode());
+}
+
 @Test
 public void test_equalsLjava_lang_Object() {
 	FontData fd1 = new FontData(SwtTestUtil.testFontName, 10, SWT.NORMAL);