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

Bug 177805: Fix the use of units in Gecko. r+sr=roc

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@219640 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sharparrow1%yahoo.com
2007-02-07 07:46:44 +00:00
parent d70c26f70c
commit dd459d0a71
164 changed files with 1364 additions and 2226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
mozilla/layout/forms/nsFormControlFrame.cpp
View File

@@ -231,10 +231,8 @@ nsFormControlFrame::GetScreenHeight(nsPresContext* aPresContext,
context->GetRect ( screen );
else
context->GetClientRect(screen);
float devUnits;
devUnits = context->DevUnitsToAppUnits();
aHeight = NSToIntRound(float(screen.height) / devUnits );
aHeight = aPresContext->AppUnitsToDevPixels(screen.height);
return NS_OK;
}
@@ -255,12 +253,6 @@ nsFormControlFrame::GetAbsoluteFramePosition(nsPresContext* aPresContext,
aAbsoluteTwipsRect.x = 0;
aAbsoluteTwipsRect.y = 0;
// Get conversions between twips and pixels
float t2p;
float p2t;
t2p = aPresContext->TwipsToPixels();
p2t = aPresContext->PixelsToTwips();
// Start with frame's offset from it it's containing view
nsIView *view = nsnull;
nsPoint frameOffset;
@@ -290,8 +282,8 @@ nsFormControlFrame::GetAbsoluteFramePosition(nsPresContext* aPresContext,
// XXX a twip version of this would be really nice here!
widget->WidgetToScreen(zeroRect, absBounds);
// Convert widget coordinates to twips
aAbsoluteTwipsRect.x += NSIntPixelsToTwips(absBounds.x, p2t);
aAbsoluteTwipsRect.y += NSIntPixelsToTwips(absBounds.y, p2t);
aAbsoluteTwipsRect.x += aPresContext->DevPixelsToAppUnits(absBounds.x);
aAbsoluteTwipsRect.y += aPresContext->DevPixelsToAppUnits(absBounds.y);
break;
}
@@ -301,11 +293,10 @@ nsFormControlFrame::GetAbsoluteFramePosition(nsPresContext* aPresContext,
// convert to pixel coordinates
if (NS_SUCCEEDED(rv)) {
aAbsolutePixelRect.x = NSTwipsToIntPixels(aAbsoluteTwipsRect.x, t2p);
aAbsolutePixelRect.y = NSTwipsToIntPixels(aAbsoluteTwipsRect.y, t2p);
aAbsolutePixelRect.width = NSTwipsToIntPixels(aAbsoluteTwipsRect.width, t2p);
aAbsolutePixelRect.height = NSTwipsToIntPixels(aAbsoluteTwipsRect.height, t2p);
aAbsolutePixelRect.x = aPresContext->AppUnitsToDevPixels(aAbsoluteTwipsRect.x);
aAbsolutePixelRect.y = aPresContext->AppUnitsToDevPixels(aAbsoluteTwipsRect.y);
aAbsolutePixelRect.width = aPresContext->AppUnitsToDevPixels(aAbsoluteTwipsRect.width);
aAbsolutePixelRect.height = aPresContext->AppUnitsToDevPixels(aAbsoluteTwipsRect.height);
}
return rv;