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

Corrected collection of common attributes, for clashing font size units.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71643 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2012-06-04 09:13:13 +00:00
parent 0a7ee6e0f4
commit 340ef5c5ab
1 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/richtext/richtextbuffer.cpp
View File

@@ -12410,6 +12410,15 @@ void wxTextAttrCollectCommonAttributes(wxTextAttr& currentStyle, const wxTextAtt
long forbiddenFlags = clashingAttr.GetFlags()|absentAttr.GetFlags(); long forbiddenFlags = clashingAttr.GetFlags()|absentAttr.GetFlags();
if (attr.HasFont()) if (attr.HasFont())
{
// If different font size units are being used, this is a clash.
if (((attr.GetFlags() & wxTEXT_ATTR_FONT_SIZE) | (currentStyle.GetFlags() & wxTEXT_ATTR_FONT_SIZE)) == wxTEXT_ATTR_FONT_SIZE)
{
currentStyle.SetFontSize(0);
currentStyle.RemoveFlag(wxTEXT_ATTR_FONT_SIZE);
clashingAttr.AddFlag(wxTEXT_ATTR_FONT_SIZE);
}
else
{ {
if (attr.HasFontPointSize() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_FONT_POINT_SIZE)) if (attr.HasFontPointSize() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_FONT_POINT_SIZE))
{ {
@@ -12440,6 +12449,7 @@ void wxTextAttrCollectCommonAttributes(wxTextAttr& currentStyle, const wxTextAtt
else else
currentStyle.SetFontPixelSize(attr.GetFontSize()); currentStyle.SetFontPixelSize(attr.GetFontSize());
} }
}
if (attr.HasFontItalic() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_FONT_ITALIC)) if (attr.HasFontItalic() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_FONT_ITALIC))
{ {