From 3ef224a9c3ba3263fbd4714160ff1cef64acedc1 Mon Sep 17 00:00:00 2001 From: "pinkerton%netscape.com" Date: Wed, 16 Sep 1998 18:44:58 +0000 Subject: [PATCH] Forgot to set fe_data in the text attr struct when dealing with fonts. git-svn-id: svn://10.0.0.236/trunk@10172 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/cmd/macfe/gui/macgui.cp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mozilla/cmd/macfe/gui/macgui.cp b/mozilla/cmd/macfe/gui/macgui.cp index 5785904f863..65b5a2c0434 100644 --- a/mozilla/cmd/macfe/gui/macgui.cp +++ b/mozilla/cmd/macfe/gui/macgui.cp @@ -98,7 +98,10 @@ HyperStyle::HyperStyle( MWContext *context, const CCharSet* charSet, LO_TextAttr fAttr = *attr; fAttr.size *= context->fontScalingPercentage; - fFontReference = CFontReference::GetFontReference(charSet, attr, context, sUnderlineLinks); + // GetFontReference() stashes font info into fAttr->FE_Data so we need to make sure that + // we propogate that info to the attribute struct that is going back to layout. + fFontReference = CFontReference::GetFontReference(charSet, &fAttr, context, sUnderlineLinks); + attr->FE_Data = fAttr.FE_Data; strike = ( attr->attrmask & LO_ATTR_STRIKEOUT ); fInlineInput = ( attr->attrmask & ( LO_ATTR_INLINEINPUT | LO_ATTR_INLINEINPUTTHICK | LO_ATTR_INLINEINPUTDOTTED ) );