Fixed border rendering during printing for Select and text, and text areas.
Implemented SetProperty/GetProperty methods for FileControlFrame Added nsGenericHTMLElement::GetPrimaryFrame check for nsnull for doc return type. nsHTMLInputElement.cpp replace NS_OK == with NS_SUCCEEDED in GetValue and SetValue Added GetName and GetValue utility methods to nsFormControlHelper modified nsButtonControlFrame::PaintButton to take the label to paint as an extra parameter. This allows it to be callable from the nsFileControlFrame code to render the button. git-svn-id: svn://10.0.0.236/trunk@20325 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -222,7 +222,9 @@ nsButtonControlFrame::Paint(nsIPresContext& aPresContext,
|
||||
nsFramePaintLayer aWhichLayer)
|
||||
{
|
||||
if (eFramePaintLayer_Content == aWhichLayer) {
|
||||
PaintButton(aPresContext, aRenderingContext, aDirtyRect);
|
||||
nsString label;
|
||||
nsresult result = GetValue(&label);
|
||||
PaintButton(aPresContext, aRenderingContext, aDirtyRect, label);
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
@@ -385,16 +387,15 @@ nsButtonControlFrame::GetFrameName(nsString& aResult) const
|
||||
void
|
||||
nsButtonControlFrame::PaintButton(nsIPresContext& aPresContext,
|
||||
nsIRenderingContext& aRenderingContext,
|
||||
const nsRect& aDirtyRect)
|
||||
const nsRect& aDirtyRect,
|
||||
nsString& aLabel)
|
||||
{
|
||||
|
||||
nsString label;
|
||||
nsresult result = GetValue(&label);
|
||||
nsFormControlHelper::PaintRectangularButton(aPresContext,
|
||||
aRenderingContext,
|
||||
aDirtyRect, mRect.width,
|
||||
mRect.height,PR_FALSE, PR_FALSE,
|
||||
mStyleContext, label, this);
|
||||
mStyleContext, aLabel, this);
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user