From 03266b10912abcc70eacb4bd34e4e1cbf5953f65 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 14 Sep 2018 19:17:34 +0200
Subject: [PATCH] Add wxFontRefData ctor from wxFontInfo to wxQt

This actually implements support for the fractional font sizes, as
previously the fractional part was lost when passing by the legacy
Create() taking only integer size.
---
 src/qt/font.cpp | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/qt/font.cpp b/src/qt/font.cpp
index fa4dfc545a..95c2b11566 100644
--- a/src/qt/font.cpp
+++ b/src/qt/font.cpp
@@ -105,6 +105,25 @@ class wxFontRefData: public wxGDIRefData
 public:
     wxFontRefData() {}
 
+    wxFontRefData(const wxFontInfo& info)
+    {
+        if ( info.HasFaceName() )
+            m_nativeFontInfo.SetFaceName(info.GetFaceName());
+        else
+            m_nativeFontInfo.SetFamily(info.GetFamily());
+
+        if ( info.IsUsingSizeInPixels() )
+            m_nativeFontInfo.SetPixelSize(info.GetPixelSize());
+        else
+            m_nativeFontInfo.SetFractionalPointSize(info.GetFractionalPointSize());
+
+        m_nativeFontInfo.SetStyle(info.GetStyle());
+        m_nativeFontInfo.SetWeight(info.GetWeight());
+        m_nativeFontInfo.SetUnderlined(info.IsUnderlined());
+        m_nativeFontInfo.SetStrikethrough(info.IsStrikethrough());
+
+    }
+
     wxFontRefData( const wxFontRefData& data )
     : wxGDIRefData()
     {
@@ -123,20 +142,7 @@ wxFont::wxFont()
 
 wxFont::wxFont(const wxFontInfo& info)
 {
-    m_refData = new wxFontRefData();
-    Create(wxSize(0, info.GetPointSize()),
-           info.GetFamily(),
-           info.GetStyle(),
-           info.GetWeight(),
-           info.IsUnderlined(),
-           info.GetFaceName(),
-           info.GetEncoding());
-
-    SetStrikethrough(info.IsStrikethrough());
-
-    wxSize pixelSize = info.GetPixelSize();
-    if ( pixelSize != wxDefaultSize )
-        SetPixelSize(pixelSize);
+    m_refData = new wxFontRefData(info);
 }
 
 wxFont::wxFont(const wxString& nativeFontInfoString)