Richard, Do you have reasons to belive that I should not do that?
JMarc
>From 92107a368a2ff8c6249f46429f84e633bc0d4e30 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes <lasgout...@lyx.org> Date: Wed, 18 Apr 2012 12:58:28 +0200 Subject: [PATCH] Remove workaround that is not useful anymore --- src/Text2.cpp | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) 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; } -- 1.7.0.4
