void InitFromNative();
private:
- bool m_underlined;
- bool m_strikethrough;
- // The native font info: basically a PangoFontDescription
+ // The native font info: basically a PangoFontDescription, plus
+ // 'underlined' and 'strikethrough' attributes not supported by Pango.
wxNativeFontInfo m_nativeFontInfo;
friend class wxFont;
if (family == wxFONTFAMILY_DEFAULT)
family = wxFONTFAMILY_SWISS;
- m_underlined = underlined;
- m_strikethrough = strikethrough;
-
// Create native font info
m_nativeFontInfo.description = pango_font_description_new();
? wxDEFAULT_FONT_SIZE
: pointSize );
SetWeight( weight == wxDEFAULT ? wxFONTWEIGHT_NORMAL : weight );
+ SetUnderlined( underlined );
+ SetStrikethrough( strikethrough );
}
void wxFontRefData::InitFromNative()
int pango_size = pango_font_description_get_size( desc );
if (pango_size == 0)
m_nativeFontInfo.SetPointSize(wxDEFAULT_FONT_SIZE);
-
- // Pango description are never underlined
- m_underlined = false;
- m_strikethrough = false;
}
wxFontRefData::wxFontRefData( const wxFontRefData& data )
: wxGDIRefData()
{
- m_underlined = data.m_underlined;
- m_strikethrough = data.m_strikethrough;
-
// Forces a copy of the internal data. wxNativeFontInfo should probably
// have a copy ctor and assignment operator to fix this properly but that
// would break binary compatibility...
void wxFontRefData::SetUnderlined(bool underlined)
{
- m_underlined = underlined;
-
- // the Pango font descriptor does not have an underlined attribute
- // (and wxNativeFontInfo::SetUnderlined asserts); rather it's
- // wxWindowDCImpl::DoDrawText that handles underlined fonts, so we
- // here we just need to save the underlined attribute
+ m_nativeFontInfo.SetUnderlined(underlined);
}
void wxFontRefData::SetStrikethrough(bool strikethrough)
{
- m_strikethrough = strikethrough;
+ m_nativeFontInfo.SetStrikethrough(strikethrough);
}
bool wxFontRefData::SetFaceName(const wxString& facename)
info.GetUnderlined(),
info.GetFaceName(),
info.GetEncoding() );
+
+ if ( info.GetStrikethrough() )
+ SetStrikethrough(true);
}
-wxFont::wxFont(int pointSize,
- wxFontFamily family,
- int flags,
- const wxString& face,
- wxFontEncoding encoding)
+wxFont::wxFont(const wxFontInfo& info)
{
- m_refData = new wxFontRefData(pointSize, family,
- GetStyleFromFlags(flags),
- GetWeightFromFlags(flags),
- GetUnderlinedFromFlags(flags),
- false, face, encoding);
+ m_refData = new wxFontRefData(info.GetPointSize(),
+ info.GetFamily(),
+ info.GetStyle(),
+ info.GetWeight(),
+ info.IsUnderlined(),
+ info.IsStrikethrough(),
+ info.GetFaceName(),
+ info.GetEncoding());
+
+ wxSize pixelSize = info.GetPixelSize();
+ if ( pixelSize != wxDefaultSize )
+ SetPixelSize(pixelSize);
}
bool wxFont::Create( int pointSize,
{
wxCHECK_MSG( IsOk(), false, wxT("invalid font") );
- return M_FONTDATA->m_underlined;
+ return M_FONTDATA->m_nativeFontInfo.GetUnderlined();
}
bool wxFont::GetStrikethrough() const
{
wxCHECK_MSG( IsOk(), false, wxT("invalid font") );
- return M_FONTDATA->m_strikethrough;
+ return M_FONTDATA->m_nativeFontInfo.GetStrikethrough();
}
wxFontEncoding wxFont::GetEncoding() const
return new wxFontRefData(*static_cast<const wxFontRefData*>(data));
}
-bool wxFont::GTKSetPangoAttrs(PangoLayout* layout, size_t len, bool addDummyAttrs) const
+bool wxFont::GTKSetPangoAttrs(PangoLayout* layout) const
{
if (!IsOk() || !(GetUnderlined() || GetStrikethrough()))
return false;
PangoAttrList* attrs = pango_attr_list_new();
PangoAttribute* a;
- if (GetUnderlined())
+ if (wx_pango_version_check(1,16,0))
{
- a = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE);
- if (len)
+ // a PangoLayout which has leading/trailing spaces with underlined font
+ // is not correctly drawn by this pango version: Pango won't underline the spaces.
+ // This can be a problem; e.g. wxHTML rendering of underlined text relies on
+ // this behaviour. To workaround this problem, we use a special hack here
+ // suggested by pango maintainer Behdad Esfahbod: we prepend and append two
+ // empty space characters and give them a dummy colour attribute.
+ // This will force Pango to underline the leading/trailing spaces, too.
+
+ const char* text = pango_layout_get_text(layout);
+ const size_t n = strlen(text);
+ if ((n > 0 && text[0] == ' ') || (n > 1 && text[n - 1] == ' '))
{
- a->start_index = 0;
- a->end_index = len;
- }
- pango_attr_list_insert(attrs, a);
-
- // Add dummy attributes (use colour as it's invisible anyhow for 0
- // width spaces) to ensure that the spaces in the beginning/end of the
- // string are underlined too.
- if ( addDummyAttrs )
- {
- wxASSERT_MSG( len > 2, "Must have 0-width spaces at string ends" );
-
+ wxCharBuffer buf(n + 6);
+ // copy the leading U+200C ZERO WIDTH NON-JOINER encoded in UTF8 format
+ memcpy(buf.data(), "\342\200\214", 3);
+ // copy the user string
+ memcpy(buf.data() + 3, text, n);
+ // copy the trailing U+200C ZERO WIDTH NON-JOINER encoded in UTF8 format
+ memcpy(buf.data() + 3 + n, "\342\200\214", 3);
+
+ pango_layout_set_text(layout, buf, n + 6);
+
+ // Add dummy attributes (use colour as it's invisible anyhow for 0
+ // width spaces) to ensure that the spaces in the beginning/end of the
+ // string are underlined too.
a = pango_attr_foreground_new(0x0057, 0x52A9, 0xD614);
a->start_index = 0;
- a->end_index = 1;
+ a->end_index = 3;
pango_attr_list_insert(attrs, a);
a = pango_attr_foreground_new(0x0057, 0x52A9, 0xD614);
- a->start_index = len - 1;
- a->end_index = len;
+ a->start_index = n + 3;
+ a->end_index = n + 6;
pango_attr_list_insert(attrs, a);
}
}
-
+ if (GetUnderlined())
+ {
+ a = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE);
+ pango_attr_list_insert(attrs, a);
+ }
if (GetStrikethrough())
{
a = pango_attr_strikethrough_new(true);
- if (len)
- {
- a->start_index = 0;
- a->end_index = len;
- }
pango_attr_list_insert(attrs, a);
}
projects / wxWidgets.git / blobdiff