anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove workaround that is not useful anymore

Browse Source
This commit is contained in:
Jean-Marc Lasgouttes 2012-04-18 12:58:28 +02:00
parent 0459c43769
commit 439da7e82a
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Text2.cpp
View File

@ -76,16 +76,7 @@ FontInfo Text::layoutFont(pit_type const pit) const
// In case the default family has been customized // In case the default family has been customized
if (layout.font.family() == INHERIT_FAMILY) if (layout.font.family() == INHERIT_FAMILY)
lf.setFamily(owner_->buffer().params().getFont().fontInfo().family()); lf.setFamily(owner_->buffer().params().getFont().fontInfo().family());
// FIXME FontInfo icf = owner_->getLayout().font();
// It ought to be possible here just to use Inset::getLayout() and skip
// the asInsetCollapsable() bit. Unfortunatley, that doesn't work right
// now, because Inset::getLayout() will return a default-constructed
// InsetLayout, and that e.g. sets the foreground color to red. So we
// need to do some work to make that possible.
InsetCollapsable const * icp = owner_->asInsetCollapsable();
if (!icp)
return lf;
FontInfo icf = icp->getLayout().font();
icf.realize(lf); icf.realize(lf);
return icf; return icf;
} }