Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some tweaks

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@111934 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rbs%maths.uq.edu.au
2002-01-11 05:08:11 +00:00
parent 0a3b34410d
commit c264cfec89
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/layout/mathml/base/src/nsMathMLChar.cpp
View File

@@ -132,12 +132,12 @@ CheckFontExistence(nsIPresContext* aPresContext, const nsString& aFontName)
}
// alert the user if some of the needed MathML fonts are not installed.
void
static void
AlertMissingFonts(nsString& aMissingFonts)
{
nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService("@mozilla.org/embedcomp/window-watcher;1"));
nsCOMPtr<nsIPrompt> prompter;
if (wwatch) {
nsCOMPtr<nsIPrompt> prompter;
wwatch->GetNewPrompter(0, getter_AddRefs(prompter));
if (prompter) {
nsAutoString message;
@@ -1038,7 +1038,7 @@ MathFontEnumCallback(const nsString& aFamily, PRBool aGeneric, void *aData)
//#ifndef _WIN32
// XXX In principle, the mathfont-family list in the mathfont.properties file
// is customizable depending on the platform. For now, this is here since there
// is no need to alter Linux users about TrueType fonts specific to Windows.
// is no need to alert Linux users about TrueType fonts specific to Windows.
if (aFamily.EqualsIgnoreCase("MT Extra"))
return PR_TRUE; // continue to try other fonts
//#endif

2
mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp
View File

@@ -504,7 +504,7 @@ nsMathMLContainerFrame::FinalizeReflow(nsIPresContext* aPresContext,
NS_MATHML_WILL_STRETCH_ALL_CHILDREN_HORIZONTALLY(mEmbellishData.flags);
nsBoundingMetrics defaultSize;
if (!mEmbellishData.core /* case of a bare <mo>...</mo> itself */
if (mEmbellishData.core == this /* case of a bare <mo>...</mo> itself */
|| stretchAll) { /* or <mover><mo>...</mo>...</mover>, or friends */
// use our current size as computed earlier by Place()
defaultSize = aDesiredSize.mBoundingMetrics;

3
mozilla/layout/mathml/base/src/nsMathMLmtableFrame.cpp
View File

@@ -406,8 +406,9 @@ nsMathMLmtableOuterFrame::Reflow(nsIPresContext* aPresContext,
const nsStyleFont *font = NS_STATIC_CAST(const nsStyleFont*,
mStyleContext->GetStyleData(eStyleStruct_Font));
aReflowState.rendContext->SetFont(font->mFont);
nsCOMPtr<nsIFontMetrics> fm;
aPresContext->GetMetricsFor(font->mFont, getter_AddRefs(fm));
aReflowState.rendContext->GetFontMetrics(*getter_AddRefs(fm));
nscoord axisHeight;
GetAxisHeight(*aReflowState.rendContext, fm, axisHeight);