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

mWidth and mHeight were getting set to 0 instead of -1 which broke menus

Browse Source 
r=kedl


git-svn-id: svn://10.0.0.236/trunk@54599 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
Jerry.Kirk%Nexwarecorp.com 1999-11-29 21:37:02 +00:00
parent fc583283d5
commit f14c309400
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
mozilla/gfx/src/photon/nsDeviceContextPh.cpp
View File

@ -58,10 +58,11 @@ nsDeviceContextPh :: nsDeviceContextPh()
mPixelScale = 1.0f;
mWidthFloat = 0.0f;
mHeightFloat = 0.0f;
/* These *MUST* be -1 */
mWidth = -1;
mHeight = -1;
mWidth = 0;
mHeight = 0;
mSpec = nsnull;
mDC = nsnull;
}
@ -269,17 +270,16 @@ NS_IMETHODIMP nsDeviceContextPh :: CreateRenderingContext(nsIRenderingContext *&
if (nsnull != pContext)
{
NS_ADDREF(pContext);
surf = new nsDrawingSurfacePh();
if (nsnull != surf)
{
#if 0
/* This is untested and may be breaking things */
PR_LOG(PhGfxLog, PR_LOG_DEBUG,("nsDeviceContextPh::CreateRenderingContext - mDC=<%p>\n", mDC));
/* I think this is a good idea... not sure if mDC is the right one tho... */
PR_LOG(PhGfxLog, PR_LOG_DEBUG,("nsDeviceContextPh::CreateRenderingContext - mDC=<%p>\n", mDC));
PhGC_t * aGC = (PhGC_t *) mDC;
rv = surf->Init(aGC);
if (NS_OK == rv)
#endif
rv = pContext->Init(this, surf);
}
else
@ -344,21 +344,15 @@ NS_IMETHODIMP nsDeviceContextPh :: GetSystemAttribute(nsSystemAttrID anID, Syste
NS_IMETHODIMP nsDeviceContextPh :: GetDrawingSurface(nsIRenderingContext &aContext, nsDrawingSurface &aSurface)
{
PR_LOG(PhGfxLog, PR_LOG_DEBUG,("nsDeviceContextPh::GetDrawingSurface - Not Implemented\n"));
/*
if (NULL == mSurface)
{
aContext.CreateDrawingSurface(nsnull, 0, mSurface);
}
aSurface = mSurface;
*/
return NS_OK;
PR_LOG(PhGfxLog, PR_LOG_DEBUG,("nsDeviceContextPh::GetDrawingSurface\n"));
aContext.CreateDrawingSurface(nsnull, 0, aSurface);
return nsnull == aSurface ? NS_ERROR_OUT_OF_MEMORY : NS_OK;
}
NS_IMETHODIMP nsDeviceContextPh :: GetClientRect(nsRect &aRect)
{
PRInt32 width, height;
PRInt32 width=-1, height=-1;
nsresult rv;
PR_LOG(PhGfxLog, PR_LOG_DEBUG,("nsDeviceContextPh::GetClientRect\n"));
@ -368,6 +362,7 @@ NS_IMETHODIMP nsDeviceContextPh :: GetClientRect(nsRect &aRect)
aRect.y = 0;
aRect.width = width;
aRect.height = height;
return rv;
}