Amebis/wxWidgets
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add wxFontInfo ctor taking fractional font size in points

Browse Source 
And implement support for it in the major ports.

Also add wxFontInfo::GetFractionalPointSize().
This commit is contained in:
Vadim Zeitlin
2018-09-12 17:50:06 +02:00
parent 2823e289d8
commit 27434db911
5 changed files with 51 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gtk/font.cpp
View File

@@ -47,7 +47,7 @@ class wxFontRefData : public wxGDIRefData
{
public:
// from broken down font parameters, also default ctor
wxFontRefData(int size = -1,
wxFontRefData(float size = -1.0f,
wxFontFamily family = wxFONTFAMILY_DEFAULT,
wxFontStyle style = wxFONTSTYLE_NORMAL,
wxFontWeight weight = wxFONTWEIGHT_NORMAL,
@@ -80,7 +80,7 @@ public:
protected:
// common part of all ctors
void Init(int pointSize,
void Init(float pointSize,
wxFontFamily family,
wxFontStyle style,
wxFontWeight weight,
@@ -106,7 +106,7 @@ private:
// wxFontRefData
// ----------------------------------------------------------------------------
void wxFontRefData::Init(int pointSize,
void wxFontRefData::Init(float pointSize,
wxFontFamily family,
wxFontStyle style,
wxFontWeight weight,
@@ -133,8 +133,11 @@ void wxFontRefData::Init(int pointSize,
}
SetStyle( style );
m_nativeFontInfo.SetPointSize( pointSize == -1 ? wxDEFAULT_FONT_SIZE
: pointSize );
m_nativeFontInfo.SetFractionalPointSize
(
pointSize < 0 ? static_cast<float>(wxDEFAULT_FONT_SIZE)
: pointSize
);
SetWeight( weight );
SetUnderlined( underlined );
SetStrikethrough( strikethrough );
@@ -157,7 +160,7 @@ wxFontRefData::wxFontRefData( const wxFontRefData& data )
{
}
wxFontRefData::wxFontRefData(int size, wxFontFamily family, wxFontStyle style,
wxFontRefData::wxFontRefData(float size, wxFontFamily family, wxFontStyle style,
wxFontWeight weight, bool underlined, bool strikethrough,
const wxString& faceName,
wxFontEncoding encoding)
@@ -282,7 +285,7 @@ wxFont::wxFont(const wxNativeFontInfo& info)
wxFont::wxFont(const wxFontInfo& info)
{
m_refData = new wxFontRefData(info.GetPointSize(),
m_refData = new wxFontRefData(info.GetFractionalPointSize(),
info.GetFamily(),
info.GetStyle(),
info.GetWeight(),
@@ -308,7 +311,8 @@ bool wxFont::Create( int pointSize,
AccountForCompatValues(pointSize, style, weight);
m_refData = new wxFontRefData(pointSize, family, style, weight,
m_refData = new wxFontRefData(wxFontInfo::ToFloatPointSize(pointSize),
family, style, weight,
underlined, false, face, encoding);
return true;

22
src/msw/font.cpp
View File

@@ -60,12 +60,12 @@ public:
// constructors
wxFontRefData()
{
Init(-1, wxSize(0,0), false, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL,
Init(-1.0f, wxSize(0,0), false, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL,
wxFONTWEIGHT_NORMAL, false, false, wxEmptyString,
wxFONTENCODING_DEFAULT);
}
wxFontRefData(int size,
wxFontRefData(float size,
const wxSize& pixelSize,
bool sizeUsingPixels,
wxFontFamily family,
@@ -267,7 +267,7 @@ public:
protected:
// common part of all ctors
void Init(int size,
void Init(float size,
const wxSize& pixelSize,
bool sizeUsingPixels,
wxFontFamily family,
@@ -342,7 +342,7 @@ protected:
// wxFontRefData
// ----------------------------------------------------------------------------
void wxFontRefData::Init(int pointSize,
void wxFontRefData::Init(float pointSize,
const wxSize& pixelSize,
bool sizeUsingPixels,
wxFontFamily family,
@@ -362,9 +362,12 @@ void wxFontRefData::Init(int pointSize,
}
else
{
m_nativeFontInfo.SetPointSize(pointSize == -1
? wxNORMAL_FONT->GetPointSize()
: pointSize);
m_nativeFontInfo.SetFractionalPointSize
(
pointSize < 0
? wxNORMAL_FONT->GetPointSize()
: pointSize
);
}
SetStyle(style);
@@ -793,7 +796,7 @@ wxFont::wxFont(const wxString& fontdesc)
wxFont::wxFont(const wxFontInfo& info)
{
m_refData = new wxFontRefData(info.GetPointSize(),
m_refData = new wxFontRefData(info.GetFractionalPointSize(),
info.GetPixelSize(),
info.IsUsingSizeInPixels(),
info.GetFamily(),
@@ -828,7 +831,8 @@ bool wxFont::DoCreate(int pointSize,
AccountForCompatValues(pointSize, style, weight);
m_refData = new wxFontRefData(pointSize, pixelSize, sizeUsingPixels,
m_refData = new wxFontRefData(wxFontInfo::ToFloatPointSize(pointSize),
pixelSize, sizeUsingPixels,
family, style, weight,
underlined, false, faceName, encoding);