b=431081; native selection box frame missing in fx3 - vista content only; r+sr=roc,a=beltzner

git-svn-id: svn://10.0.0.236/trunk@250906 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
vladimir%pobox.com
2008-04-29 03:55:07 +00:00
parent 11c761ceb5
commit 685e2a2b04

View File

@@ -1399,7 +1399,13 @@ nsComboboxControlFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
}
void nsComboboxControlFrame::PaintFocus(nsIRenderingContext& aRenderingContext,
nsPoint aPt) {
nsPoint aPt)
{
/* Do we need to do anything? */
if (mContent->HasAttr(kNameSpaceID_None, nsGkAtoms::disabled) ||
mFocused != this)
return;
aRenderingContext.PushState();
nsRect clipRect = mDisplayFrame->GetRect() + aPt;
aRenderingContext.SetClipRect(clipRect, nsClipCombine_kIntersect);
@@ -1410,16 +1416,12 @@ void nsComboboxControlFrame::PaintFocus(nsIRenderingContext& aRenderingContext,
/////////////////////
// draw focus
// XXX This is only temporary
if (!mContent->HasAttr(kNameSpaceID_None, nsGkAtoms::disabled) &&
mFocused == this) {
aRenderingContext.SetLineStyle(nsLineStyle_kDotted);
aRenderingContext.SetColor(GetStyleColor()->mColor);
} else {
aRenderingContext.SetColor(GetStyleBackground()->mBackgroundColor);
aRenderingContext.SetLineStyle(nsLineStyle_kSolid);
}
aRenderingContext.SetLineStyle(nsLineStyle_kDotted);
aRenderingContext.SetColor(GetStyleColor()->mColor);
//aRenderingContext.DrawRect(clipRect);
nscoord onePixel = nsPresContext::CSSPixelsToAppUnits(1);
clipRect.width -= onePixel;
clipRect.height -= onePixel;