Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 20:35:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed an offset bug, setting the orgin setting for the correct grafports

Browse Source
This commit is contained in:
dcone%netscape.com 1998-10-06 13:30:46 +00:00
parent eaf1d9324c
commit 2ac2debd51
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,17 +42,6 @@ DrawString(); DrawText for cstrings
//#define NO_CLIP
/*
Some Implementation Notes
REGIONS: Regions are clipping rects associated with a GC. Since
multiple Drawable's can and do share GC's (they are hardware cached)
In order to select clip rect's into GC's, they must be writeable. Thus,
any consumer of the 'gfx' library must assume that GC's created by them
will be modified in gfx.
*/
class GraphicsState
{
public:
@ -66,6 +55,8 @@ public:
nscolor mColor;
nsIFontMetrics *mFontMetrics;
PRInt32 mFont;
PRInt32 mOffx;
PRInt32 mOffy;
};
//------------------------------------------------------------------------
@ -78,6 +69,8 @@ GraphicsState :: GraphicsState()
mColor = NS_RGB(0, 0, 0);
mFontMetrics = nsnull;
mFont = 0;
mOffx = 0;
mOffy = 0;
}
//------------------------------------------------------------------------
@ -104,6 +97,8 @@ nsRenderingContextMac :: nsRenderingContextMac()
mStateCache = new nsVoidArray();
mClipRegion = nsnull;
mCurrFontHandle = 0;
mOffx = 0;
mOffy = 0;
PushState();
}
@ -114,7 +109,7 @@ nsRenderingContextMac :: ~nsRenderingContextMac()
if(mRenderingSurface)
{
::SetPort(mRenderingSurface);
::SetPort(mOriSurface);
::SetOrigin(0,0);
}
@ -156,7 +151,7 @@ NS_IMPL_RELEASE(nsRenderingContextMac)
nsresult nsRenderingContextMac :: Init(nsIDeviceContext* aContext,nsIWidget *aWindow)
{
PRInt32 offx,offy;
PRInt32 offx,offy;
if (nsnull == aWindow->GetNativeData(NS_NATIVE_WINDOW))
return NS_ERROR_NOT_INITIALIZED;
@ -172,6 +167,7 @@ PRInt32 offx,offy;
mMainRegion = (RgnHandle)aWindow->GetNativeData(NS_NATIVE_REGION);
mOriSurface = mRenderingSurface; // we need to know when we set back
::SetPort(mRenderingSurface);
::SetOrigin(-offx,-offy);
@ -272,6 +268,9 @@ Rect mac_rect;
state->mLocalClip.x + state->mLocalClip.width,state->mLocalClip.y + state->mLocalClip.height);
}
state->mOffx = mOffx;
state->mOffy = mOffy;
state->mColor = mCurrentColor;
}
@ -319,6 +318,10 @@ PRBool bEmpty = PR_FALSE;
if (state->mColor != mCurrentColor)
SetColor(state->mColor);
mOffy = state->mOffy;
mOffx = state->mOffx;
::SetOrigin(mOffy,mOffx);
// Delete this graphics state object
delete state;
}
@ -1104,7 +1107,6 @@ Rect srcrect,dstrect;
offscreenPM = ::GetGWorldPixMap((GWorldPtr)mRenderingSurface);
LockPixels(offscreenPM);
//srcpix = *offscreenPM;
srcpix = (PixMapPtr)*offscreenPM;
::RGBForeColor(&rgbblack);
::RGBBackColor(&rgbwhite);

3
gfx/src/mac/nsRenderingContextMac.h
View File

@ -120,11 +120,14 @@ protected:
float mP2T;
nsDrawingSurfaceMac mRenderingSurface; // main drawing surface,Can be a BackBuffer if Selected in
nsDrawingSurfaceMac mFrontBuffer; // current buffer to draw into
nsDrawingSurfaceMac mOriSurface;
nsIDeviceContext *mContext;
nsIFontMetrics *mFontMetrics;
RgnHandle mClipRegion;
RgnHandle mMainRegion;
PRInt32 mCurrFontHandle;
PRInt32 mOffx;
PRInt32 mOffy;
//state management
nsVoidArray *mStateCache;