Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-25 11:58:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix SetClipRegion + FillRect / added a temp SetFont / dispose mMainRegion

Browse Source
This commit is contained in:
pierre%netscape.com 1998-09-11 10:37:36 +00:00
parent 640eb49bd7
commit 502a96beeb
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gfx/src/mac/nsRenderingContextMac.cpp
View File

@ -35,6 +35,7 @@ DrawString(); DrawText for cstrings
#include <QDOffscreen.h>
#include "nsRegionMac.h"
#include "nsGfxCIID.h"
#include <Fonts.h>
//#define NO_CLIP
@ -91,7 +92,7 @@ nsRenderingContextMac :: nsRenderingContextMac()
{
NS_INIT_REFCNT();
//mFontCache = nsnull ;
mFontCache = nsnull ;
mFontMetrics = nsnull ;
mContext = nsnull ;
mRenderingSurface = nsnull ;
@ -431,10 +432,10 @@ RgnHandle mregion;
mregion = pRegion->GetRegion();
mrect = (**mClipRegion).rgnBBox;
mrect = (**mregion).rgnBBox;
rect.x = mrect.left;
rect.y = mrect.right;
rect.y = mrect.top;
rect.width = mrect.right-mrect.left;
rect.height = mrect.bottom-mrect.top;
@ -513,6 +514,20 @@ void nsRenderingContextMac :: SetFont(const nsFont& aFont)
// mRenderingSurface->gc);
}
*/
//NS_IF_RELEASE(mFontMetrics);
//mFontCache->GetMetricsFor(aFont, mFontMetrics);
//if (mFontMetrics)
{
nsString nstr(aFont.name);
nstr.Truncate(254);
Str255 aStr;
aStr[0] = nstr.Length();
nstr.ToCString((char*)&aStr[1], 254);
short fnum;
::GetFNum(aStr, &fnum);
::TextFont(fnum);
}
}
//------------------------------------------------------------------------
@ -590,6 +605,9 @@ GWorldPtr theoff;
if (mRenderingSurface == (GrafPtr)theoff)
mRenderingSurface = nsnull;
DisposeRgn(mMainRegion);
mMainRegion = nsnull;
}
//------------------------------------------------------------------------
@ -661,7 +679,7 @@ Rect therect;
::SetPort(mRenderingSurface);
::SetClip(mMainRegion);
::SetRect(&therect,aX,aY,aX+aWidth,aY+aHeight);
::SetRect(&therect,x,y,x+w,y+h);
::PaintRect(&therect);
}