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

Remove the special painting code for a 165-twips checkbox. Move the remaining parts of nsFormControlHelper to its consumers and remove nsFormControlHelper.{cpp,h} from the tree. b=343495 r+sr=roc (r=me on roc's part)

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@201677 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mats.palmgren%bredband.net
2006-07-06 10:43:51 +00:00
parent 20ae293a00
commit 14e56648c0
18 changed files with 137 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mozilla/layout/forms/nsComboboxControlFrame.cpp
View File

@@ -88,6 +88,7 @@
#include "nsStyleSet.h"
#include "nsNodeInfoManager.h"
#include "nsContentCreatorFunctions.h"
#include "nsLayoutUtils.h"
#include "nsDisplayList.h"
#ifdef MOZ_XUL
@@ -625,7 +626,9 @@ nsComboboxControlFrame::ReflowItems(nsPresContext* aPresContext,
//printf("*****************\n");
nscoord visibleHeight = 0;
nsCOMPtr<nsIFontMetrics> fontMet;
nsresult res = nsFormControlHelper::GetFrameFontFM(mDisplayFrame, getter_AddRefs(fontMet));
nsresult res =
nsLayoutUtils::GetFontMetricsForFrame(mDisplayFrame,
getter_AddRefs(fontMet));
if (fontMet) {
fontMet->GetHeight(visibleHeight);
}
@@ -1481,7 +1484,7 @@ nsComboboxControlFrame::GetFrameName(nsAString& aResult) const
void
nsComboboxControlFrame::ShowDropDown(PRBool aDoDropDown)
{
if (nsFormControlHelper::GetDisabled(mContent)) {
if (mContent->HasAttr(kNameSpaceID_None, nsHTMLAtoms::disabled)) {
return;
}
@@ -1702,7 +1705,7 @@ nsComboboxControlFrame::HandleEvent(nsPresContext* aPresContext,
if (nsEventStatus_eConsumeNoDefault == *aEventStatus) {
return NS_OK;
}
if (nsFormControlHelper::GetDisabled(mContent)) {
if (mContent->HasAttr(kNameSpaceID_None, nsHTMLAtoms::disabled)) {
return NS_OK;
}
@@ -2073,7 +2076,8 @@ void nsComboboxControlFrame::PaintFocus(nsIRenderingContext& aRenderingContext,
/////////////////////
// draw focus
// XXX This is only temporary
if (!nsFormControlHelper::GetDisabled(mContent) && mFocused == this) {
if (!mContent->HasAttr(kNameSpaceID_None, nsHTMLAtoms::disabled) &&
mFocused == this) {
aRenderingContext.SetLineStyle(nsLineStyle_kDotted);
aRenderingContext.SetColor(0);
} else {