lili/opennurbs
1
0
Fork 0
mirror of https://github.com/mcneel/opennurbs.git synced 2026-03-17 06:46:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update source to v6.8.18240.20051

Browse Source 
Previous source was actually for 6.1...
This commit is contained in:
Will Pearson
2018-09-15 11:26:15 -07:00
committed by Bozo
parent 0ae09c4811
commit 5f462fed0d
124 changed files with 27735 additions and 4925 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
opennurbs_textrun.cpp
View File

@@ -510,20 +510,25 @@ void ON_TextRun::Init(
m_color = color;
m_run_text_height = height;
m_stackscale = stackscale;
//if (managed_font->IsBold() != bold || managed_font->IsItalic() != italic ||
// managed_font->IsUnderlined() != underlined || managed_font->IsStrikethrough() != strikethrough)
{
ON_Font font(*managed_font);
font.SetFontWeight(bold ? ON_Font::Weight::Bold : ON_Font::Weight::Normal);
font.SetFontStyle(italic ? ON_Font::Style::Italic : ON_Font::Style::Upright);
font.SetUnderlined(underlined);
font.SetStrikethrough(strikethrough);
const ON_Font* newfont = ON_Font::GetManagedFont(font, true);
m_managed_font = newfont;
if (nullptr == managed_font)
managed_font = &ON_Font::Default;
if (
false == managed_font->IsManagedFont()
|| managed_font->IsBold() != bold
|| managed_font->IsItalic() != italic
|| managed_font->IsUnderlined() != underlined
|| managed_font->IsStrikethrough() != strikethrough
)
{
managed_font = ON_Font::ManagedFontFromRichTextProperties(
ON_Font::RichTextFontName(managed_font, true),
bold,
italic,
underlined,
strikethrough);
}
//else
// m_managed_font = managed_font;
m_managed_font = managed_font;
}
bool ON_TextRun::IsText() const