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

18
mozilla/layout/generic/nsHTMLReflowState.cpp
View File

@@ -1691,11 +1691,10 @@ nsCSSOffsetState::InitOffsets(nscoord aContainingBlockWidth,
presContext->GetTheme()->GetWidgetPadding(presContext->DeviceContext(),
frame, disp->mAppearance,
&mComputedPadding)) {
float p2t = presContext->ScaledPixelsToTwips();
mComputedPadding.top = NSIntPixelsToTwips(mComputedPadding.top, p2t);
mComputedPadding.right = NSIntPixelsToTwips(mComputedPadding.right, p2t);
mComputedPadding.bottom = NSIntPixelsToTwips(mComputedPadding.bottom, p2t);
mComputedPadding.left = NSIntPixelsToTwips(mComputedPadding.left, p2t);
mComputedPadding.top = presContext->DevPixelsToAppUnits(mComputedPadding.top);
mComputedPadding.right = presContext->DevPixelsToAppUnits(mComputedPadding.right);
mComputedPadding.bottom = presContext->DevPixelsToAppUnits(mComputedPadding.bottom);
mComputedPadding.left = presContext->DevPixelsToAppUnits(mComputedPadding.left);
}
else if (aPadding) { // padding is an input arg
mComputedPadding.top = aPadding->top;
@@ -1711,15 +1710,14 @@ nsCSSOffsetState::InitOffsets(nscoord aContainingBlockWidth,
presContext->GetTheme()->GetWidgetBorder(presContext->DeviceContext(),
frame, disp->mAppearance,
&mComputedBorderPadding);
float p2t = presContext->ScaledPixelsToTwips();
mComputedBorderPadding.top =
NSIntPixelsToTwips(mComputedBorderPadding.top, p2t);
presContext->DevPixelsToAppUnits(mComputedBorderPadding.top);
mComputedBorderPadding.right =
NSIntPixelsToTwips(mComputedBorderPadding.right, p2t);
presContext->DevPixelsToAppUnits(mComputedBorderPadding.right);
mComputedBorderPadding.bottom =
NSIntPixelsToTwips(mComputedBorderPadding.bottom, p2t);
presContext->DevPixelsToAppUnits(mComputedBorderPadding.bottom);
mComputedBorderPadding.left =
NSIntPixelsToTwips(mComputedBorderPadding.left, p2t);
presContext->DevPixelsToAppUnits(mComputedBorderPadding.left);
}
else if (aBorder) { // border is an input arg
mComputedBorderPadding = *aBorder;