Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-11 16:32:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

set the default image size to be small in order to avoid obvious reflows when button code would assume 30x30 before it loaded the image (r=evaughan).

Browse Source
This commit is contained in:
pinkerton%netscape.com 1999-11-11 00:58:42 +00:00
parent 114504ab0c
commit e00369c44e
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
layout/xul/base/src/nsTitledButtonFrame.cpp
View File

@ -1340,16 +1340,17 @@ nsTitledButtonFrame::GetImageSize(nsIPresContext* aPresContext)
{
nsSize s(0,0);
nsHTMLReflowMetrics desiredSize(&s);
const PRInt32 kDefaultSize = 10;
float p2t;
aPresContext->GetScaledPixelsToTwips(&p2t);
const PRInt32 kDefaultSizeInTwips = NSIntPixelsToTwips(kDefaultSize, p2t);
// not calculated? Get the intrinsic size
if (mHasImage) {
// get the size of the image and set the desired size
if (mSizeFrozen) {
float p2t;
aPresContext->GetScaledPixelsToTwips(&p2t);
int v = NSIntPixelsToTwips(30, p2t);
mImageRect.width = v;
mImageRect.height = v;
mImageRect.width = kDefaultSizeInTwips;
mImageRect.height = kDefaultSizeInTwips;
return;
} else {
// Ask the image loader for the *intrinsic* image size
@ -1357,13 +1358,8 @@ nsTitledButtonFrame::GetImageSize(nsIPresContext* aPresContext)
if (desiredSize.width == 1 || desiredSize.height == 1)
{
// Use temporary size of 30x30 pixels until the size arrives
float p2t;
aPresContext->GetScaledPixelsToTwips(&p2t);
int v = NSIntPixelsToTwips(30, p2t);
mImageRect.width = v;
mImageRect.height = v;
mImageRect.width = kDefaultSizeInTwips;
mImageRect.height = kDefaultSizeInTwips;
return;
}
}