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

don't use font sizes less than 1 with Pango (remaining part of patch 1671684); refactor the font size setting code to eliminate duplication

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-03-08 00:44:54 +00:00
parent 3d63133a5e
commit cb5ec61f65
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/x11/font.cpp
View File

@@ -187,12 +187,6 @@ void wxFontRefData::Init(int pointSize,
m_style = style == wxDEFAULT ? wxFONTSTYLE_NORMAL : style; m_style = style == wxDEFAULT ? wxFONTSTYLE_NORMAL : style;
m_weight = weight == wxDEFAULT ? wxFONTWEIGHT_NORMAL : weight; m_weight = weight == wxDEFAULT ? wxFONTWEIGHT_NORMAL : weight;
// and here, do we really want to forbid creation of the font of the size
// 90 (the value of wxDEFAULT)??
m_pointSize = pointSize == wxDEFAULT || pointSize == -1
? wxDEFAULT_FONT_SIZE
: pointSize;
m_underlined = underlined; m_underlined = underlined;
m_encoding = encoding; m_encoding = encoding;
@@ -229,10 +223,11 @@ void wxFontRefData::Init(int pointSize,
} }
m_nativeFontInfo.SetFaceName(m_faceName); m_nativeFontInfo.SetFaceName(m_faceName);
m_nativeFontInfo.SetPointSize(m_pointSize);
m_nativeFontInfo.SetWeight((wxFontWeight)m_weight); m_nativeFontInfo.SetWeight((wxFontWeight)m_weight);
m_nativeFontInfo.SetStyle((wxFontStyle)m_style); m_nativeFontInfo.SetStyle((wxFontStyle)m_style);
#endif // wxUSE_UNICODE #endif // wxUSE_UNICODE
SetPointSize(pointSize);
} }
void wxFontRefData::InitFromNative() void wxFontRefData::InitFromNative()
@@ -470,13 +465,12 @@ wxFontRefData::~wxFontRefData()
void wxFontRefData::SetPointSize(int pointSize) void wxFontRefData::SetPointSize(int pointSize)
{ {
m_pointSize = pointSize; // NB: Pango doesn't support point sizes less than 1
m_pointSize = pointSize == wxDEFAULT || pointSize < 1 ? wxDEFAULT_FONT_SIZE
: pointSize;
#if wxUSE_UNICODE #if wxUSE_UNICODE
// Get native info m_nativeFontInfo.SetPointSize(m_pointSize);
PangoFontDescription *desc = m_nativeFontInfo.description;
pango_font_description_set_size( desc, m_pointSize * PANGO_SCALE );
#endif #endif
} }