The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 439da7e82abb728d0edf7f47247df9437026b48f Author: Jean-Marc Lasgouttes <[email protected]> Date: Wed Apr 18 12:58:28 2012 +0200 Remove workaround that is not useful anymore diff --git a/src/Text2.cpp b/src/Text2.cpp index 184de7b..7ff4a8a 100644 --- a/src/Text2.cpp +++ b/src/Text2.cpp @@ -76,16 +76,7 @@ FontInfo Text::layoutFont(pit_type const pit) const // In case the default family has been customized if (layout.font.family() == INHERIT_FAMILY) lf.setFamily(owner_->buffer().params().getFont().fontInfo().family()); - // FIXME - // 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(); + FontInfo icf = owner_->getLayout().font(); icf.realize(lf); return icf; } ----------------------------------------------------------------------- Summary of changes: src/Text2.cpp | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) hooks/post-receive -- The LyX Source Repository
