From 4ed34567a97079adb8087c6d5b433fed2abf3b93 Mon Sep 17 00:00:00 2001 From: "rods%netscape.com" Date: Thu, 30 Sep 1999 11:30:04 +0000 Subject: [PATCH] Changed getVerticalInsidePading to take the PresContext to the method can use the cached LookAndFeel object git-svn-id: svn://10.0.0.236/trunk@49421 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/forms/nsFileControlFrame.cpp | 5 +++-- mozilla/layout/forms/nsFileControlFrame.h | 3 ++- mozilla/layout/forms/nsFormControlFrame.cpp | 7 ++++--- mozilla/layout/forms/nsFormControlFrame.h | 3 ++- mozilla/layout/forms/nsHTMLButtonControlFrame.cpp | 6 ++++-- mozilla/layout/forms/nsHTMLButtonControlFrame.h | 3 ++- mozilla/layout/forms/nsImageControlFrame.cpp | 8 +++++--- mozilla/layout/html/forms/src/nsFileControlFrame.cpp | 5 +++-- mozilla/layout/html/forms/src/nsFileControlFrame.h | 3 ++- mozilla/layout/html/forms/src/nsFormControlFrame.cpp | 7 ++++--- mozilla/layout/html/forms/src/nsFormControlFrame.h | 3 ++- .../html/forms/src/nsHTMLButtonControlFrame.cpp | 6 ++++-- .../layout/html/forms/src/nsHTMLButtonControlFrame.h | 3 ++- .../layout/html/forms/src/nsImageControlFrame.cpp | 8 +++++--- .../html/forms/src/nsNativeCheckboxControlFram.cpp | 12 +++++------- .../html/forms/src/nsNativeCheckboxControlFram.h | 2 +- 16 files changed, 50 insertions(+), 34 deletions(-) diff --git a/mozilla/layout/forms/nsFileControlFrame.cpp b/mozilla/layout/forms/nsFileControlFrame.cpp index 88af780bde5..c47605bd271 100644 --- a/mozilla/layout/forms/nsFileControlFrame.cpp +++ b/mozilla/layout/forms/nsFileControlFrame.cpp @@ -449,8 +449,9 @@ nsFileControlFrame::GetFont(nsIPresContext* aPresContext, return NS_OK; } nscoord -nsFileControlFrame::GetVerticalInsidePadding(float aPixToTwip, - nscoord aInnerHeight) const +nsFileControlFrame::GetVerticalInsidePadding(nsIPresContext& aPresContext, + float aPixToTwip, + nscoord aInnerHeight) const { return 0; } diff --git a/mozilla/layout/forms/nsFileControlFrame.h b/mozilla/layout/forms/nsFileControlFrame.h index 12efcab41ca..c38f67e4a9d 100644 --- a/mozilla/layout/forms/nsFileControlFrame.h +++ b/mozilla/layout/forms/nsFileControlFrame.h @@ -85,7 +85,8 @@ public: nsFont& aFont); NS_IMETHOD GetFormContent(nsIContent*& aContent) const; - virtual nscoord GetVerticalInsidePadding(float aPixToTwip, + virtual nscoord GetVerticalInsidePadding(nsIPresContext& aPresContext, + float aPixToTwip, nscoord aInnerHeight) const; virtual nscoord GetHorizontalInsidePadding(nsIPresContext& aPresContext, float aPixToTwip, diff --git a/mozilla/layout/forms/nsFormControlFrame.cpp b/mozilla/layout/forms/nsFormControlFrame.cpp index a5ccbf13fee..52fe6a81128 100644 --- a/mozilla/layout/forms/nsFormControlFrame.cpp +++ b/mozilla/layout/forms/nsFormControlFrame.cpp @@ -107,8 +107,9 @@ nsFormControlFrame::GetHorizontalBorderWidth(float aPixToTwip) const } nscoord -nsFormControlFrame::GetVerticalInsidePadding(float aPixToTwip, - nscoord aInnerHeight) const +nsFormControlFrame::GetVerticalInsidePadding(nsIPresContext& aPresContext, + float aPixToTwip, + nscoord aInnerHeight) const { return NSIntPixelsToTwips(3, aPixToTwip); } @@ -119,7 +120,7 @@ nsFormControlFrame::GetHorizontalInsidePadding(nsIPresContext& aPresContext, nscoord aInnerWidth, nscoord aCharWidth) const { - return GetVerticalInsidePadding(aPixToTwip, aInnerWidth); + return GetVerticalInsidePadding(aPresContext, aPixToTwip, aInnerWidth); } PRInt32 diff --git a/mozilla/layout/forms/nsFormControlFrame.h b/mozilla/layout/forms/nsFormControlFrame.h index 32f65bc5794..4fd0dceb097 100644 --- a/mozilla/layout/forms/nsFormControlFrame.h +++ b/mozilla/layout/forms/nsFormControlFrame.h @@ -152,7 +152,8 @@ public: static nscoord GetScrollbarWidth(float aPixToTwip); virtual nscoord GetVerticalBorderWidth(float aPixToTwip) const; virtual nscoord GetHorizontalBorderWidth(float aPixToTwip) const; - virtual nscoord GetVerticalInsidePadding(float aPixToTwip, + virtual nscoord GetVerticalInsidePadding(nsIPresContext& aPresContext, + float aPixToTwip, nscoord aInnerHeight) const; virtual nscoord GetHorizontalInsidePadding(nsIPresContext& aPresContext, float aPixToTwip, diff --git a/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp b/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp index 1148d69d8f5..befc0755595 100644 --- a/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp +++ b/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp @@ -400,6 +400,7 @@ nsHTMLButtonControlFrame::Paint(nsIPresContext& aPresContext, const nsRect& aDirtyRect, nsFramePaintLayer aWhichLayer) { + printf("*********** nsHTMLButtonControlFrame::Paint\n"); const nsStyleDisplay* disp = (const nsStyleDisplay*) mStyleContext->GetStyleData(eStyleStruct_Display); if (disp->mVisible) @@ -608,8 +609,9 @@ nsHTMLButtonControlFrame::GetFormContent(nsIContent*& aContent) const } nscoord -nsHTMLButtonControlFrame::GetVerticalInsidePadding(float aPixToTwip, - nscoord aInnerHeight) const +nsHTMLButtonControlFrame::GetVerticalInsidePadding(nsIPresContext& aPresContext, + float aPixToTwip, + nscoord aInnerHeight) const { return 0; } diff --git a/mozilla/layout/forms/nsHTMLButtonControlFrame.h b/mozilla/layout/forms/nsHTMLButtonControlFrame.h index ed56614886a..ea6f1560037 100644 --- a/mozilla/layout/forms/nsHTMLButtonControlFrame.h +++ b/mozilla/layout/forms/nsHTMLButtonControlFrame.h @@ -118,7 +118,8 @@ public: nsFont& aFont); NS_IMETHOD GetFormContent(nsIContent*& aContent) const; - virtual nscoord GetVerticalInsidePadding(float aPixToTwip, + virtual nscoord GetVerticalInsidePadding(nsIPresContext& aPresContext, + float aPixToTwip, nscoord aInnerHeight) const; virtual nscoord GetHorizontalInsidePadding(nsIPresContext& aPresContext, float aPixToTwip, diff --git a/mozilla/layout/forms/nsImageControlFrame.cpp b/mozilla/layout/forms/nsImageControlFrame.cpp index 029958f60d4..9b191955e05 100644 --- a/mozilla/layout/forms/nsImageControlFrame.cpp +++ b/mozilla/layout/forms/nsImageControlFrame.cpp @@ -105,7 +105,8 @@ public: nsFont& aFont); NS_IMETHOD GetFormContent(nsIContent*& aContent) const; - virtual nscoord GetVerticalInsidePadding(float aPixToTwip, + virtual nscoord GetVerticalInsidePadding(nsIPresContext& aPresContext, + float aPixToTwip, nscoord aInnerHeight) const; virtual nscoord GetHorizontalInsidePadding(nsIPresContext& aPresContext, float aPixToTwip, @@ -436,8 +437,9 @@ nsImageControlFrame::GetFormContent(nsIContent*& aContent) const } nscoord -nsImageControlFrame::GetVerticalInsidePadding(float aPixToTwip, - nscoord aInnerHeight) const +nsImageControlFrame::GetVerticalInsidePadding(nsIPresContext& aPresContext, + float aPixToTwip, + nscoord aInnerHeight) const { return 0; } diff --git a/mozilla/layout/html/forms/src/nsFileControlFrame.cpp b/mozilla/layout/html/forms/src/nsFileControlFrame.cpp index 88af780bde5..c47605bd271 100644 --- a/mozilla/layout/html/forms/src/nsFileControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsFileControlFrame.cpp @@ -449,8 +449,9 @@ nsFileControlFrame::GetFont(nsIPresContext* aPresContext, return NS_OK; } nscoord -nsFileControlFrame::GetVerticalInsidePadding(float aPixToTwip, - nscoord aInnerHeight) const +nsFileControlFrame::GetVerticalInsidePadding(nsIPresContext& aPresContext, + float aPixToTwip, + nscoord aInnerHeight) const { return 0; } diff --git a/mozilla/layout/html/forms/src/nsFileControlFrame.h b/mozilla/layout/html/forms/src/nsFileControlFrame.h index 12efcab41ca..c38f67e4a9d 100644 --- a/mozilla/layout/html/forms/src/nsFileControlFrame.h +++ b/mozilla/layout/html/forms/src/nsFileControlFrame.h @@ -85,7 +85,8 @@ public: nsFont& aFont); NS_IMETHOD GetFormContent(nsIContent*& aContent) const; - virtual nscoord GetVerticalInsidePadding(float aPixToTwip, + virtual nscoord GetVerticalInsidePadding(nsIPresContext& aPresContext, + float aPixToTwip, nscoord aInnerHeight) const; virtual nscoord GetHorizontalInsidePadding(nsIPresContext& aPresContext, float aPixToTwip, diff --git a/mozilla/layout/html/forms/src/nsFormControlFrame.cpp b/mozilla/layout/html/forms/src/nsFormControlFrame.cpp index a5ccbf13fee..52fe6a81128 100644 --- a/mozilla/layout/html/forms/src/nsFormControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsFormControlFrame.cpp @@ -107,8 +107,9 @@ nsFormControlFrame::GetHorizontalBorderWidth(float aPixToTwip) const } nscoord -nsFormControlFrame::GetVerticalInsidePadding(float aPixToTwip, - nscoord aInnerHeight) const +nsFormControlFrame::GetVerticalInsidePadding(nsIPresContext& aPresContext, + float aPixToTwip, + nscoord aInnerHeight) const { return NSIntPixelsToTwips(3, aPixToTwip); } @@ -119,7 +120,7 @@ nsFormControlFrame::GetHorizontalInsidePadding(nsIPresContext& aPresContext, nscoord aInnerWidth, nscoord aCharWidth) const { - return GetVerticalInsidePadding(aPixToTwip, aInnerWidth); + return GetVerticalInsidePadding(aPresContext, aPixToTwip, aInnerWidth); } PRInt32 diff --git a/mozilla/layout/html/forms/src/nsFormControlFrame.h b/mozilla/layout/html/forms/src/nsFormControlFrame.h index 32f65bc5794..4fd0dceb097 100644 --- a/mozilla/layout/html/forms/src/nsFormControlFrame.h +++ b/mozilla/layout/html/forms/src/nsFormControlFrame.h @@ -152,7 +152,8 @@ public: static nscoord GetScrollbarWidth(float aPixToTwip); virtual nscoord GetVerticalBorderWidth(float aPixToTwip) const; virtual nscoord GetHorizontalBorderWidth(float aPixToTwip) const; - virtual nscoord GetVerticalInsidePadding(float aPixToTwip, + virtual nscoord GetVerticalInsidePadding(nsIPresContext& aPresContext, + float aPixToTwip, nscoord aInnerHeight) const; virtual nscoord GetHorizontalInsidePadding(nsIPresContext& aPresContext, float aPixToTwip, diff --git a/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp b/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp index 1148d69d8f5..befc0755595 100644 --- a/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp @@ -400,6 +400,7 @@ nsHTMLButtonControlFrame::Paint(nsIPresContext& aPresContext, const nsRect& aDirtyRect, nsFramePaintLayer aWhichLayer) { + printf("*********** nsHTMLButtonControlFrame::Paint\n"); const nsStyleDisplay* disp = (const nsStyleDisplay*) mStyleContext->GetStyleData(eStyleStruct_Display); if (disp->mVisible) @@ -608,8 +609,9 @@ nsHTMLButtonControlFrame::GetFormContent(nsIContent*& aContent) const } nscoord -nsHTMLButtonControlFrame::GetVerticalInsidePadding(float aPixToTwip, - nscoord aInnerHeight) const +nsHTMLButtonControlFrame::GetVerticalInsidePadding(nsIPresContext& aPresContext, + float aPixToTwip, + nscoord aInnerHeight) const { return 0; } diff --git a/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.h b/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.h index ed56614886a..ea6f1560037 100644 --- a/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.h +++ b/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.h @@ -118,7 +118,8 @@ public: nsFont& aFont); NS_IMETHOD GetFormContent(nsIContent*& aContent) const; - virtual nscoord GetVerticalInsidePadding(float aPixToTwip, + virtual nscoord GetVerticalInsidePadding(nsIPresContext& aPresContext, + float aPixToTwip, nscoord aInnerHeight) const; virtual nscoord GetHorizontalInsidePadding(nsIPresContext& aPresContext, float aPixToTwip, diff --git a/mozilla/layout/html/forms/src/nsImageControlFrame.cpp b/mozilla/layout/html/forms/src/nsImageControlFrame.cpp index 029958f60d4..9b191955e05 100644 --- a/mozilla/layout/html/forms/src/nsImageControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsImageControlFrame.cpp @@ -105,7 +105,8 @@ public: nsFont& aFont); NS_IMETHOD GetFormContent(nsIContent*& aContent) const; - virtual nscoord GetVerticalInsidePadding(float aPixToTwip, + virtual nscoord GetVerticalInsidePadding(nsIPresContext& aPresContext, + float aPixToTwip, nscoord aInnerHeight) const; virtual nscoord GetHorizontalInsidePadding(nsIPresContext& aPresContext, float aPixToTwip, @@ -436,8 +437,9 @@ nsImageControlFrame::GetFormContent(nsIContent*& aContent) const } nscoord -nsImageControlFrame::GetVerticalInsidePadding(float aPixToTwip, - nscoord aInnerHeight) const +nsImageControlFrame::GetVerticalInsidePadding(nsIPresContext& aPresContext, + float aPixToTwip, + nscoord aInnerHeight) const { return 0; } diff --git a/mozilla/layout/html/forms/src/nsNativeCheckboxControlFram.cpp b/mozilla/layout/html/forms/src/nsNativeCheckboxControlFram.cpp index 6a1f0d32054..a96d8f55e45 100644 --- a/mozilla/layout/html/forms/src/nsNativeCheckboxControlFram.cpp +++ b/mozilla/layout/html/forms/src/nsNativeCheckboxControlFram.cpp @@ -26,13 +26,12 @@ #include "nsILookAndFeel.h" #include "nsWidgetsCID.h" #include "nsIComponentManager.h" +#include "nsCOMPtr.h" #define NS_DEFAULT_CHECKBOX_SIZE 12 static NS_DEFINE_IID(kICheckButtonIID, NS_ICHECKBUTTON_IID); -static NS_DEFINE_IID(kLookAndFeelCID, NS_LOOKANDFEEL_CID); -static NS_DEFINE_IID(kILookAndFeelIID, NS_ILOOKANDFEEL_IID); nsresult @@ -52,13 +51,12 @@ NS_NewNativeCheckboxControlFrame(nsIFrame** aNewFrame) nscoord -nsNativeCheckboxControlFrame::GetCheckboxSize(float aPixToTwip) const +nsNativeCheckboxControlFrame::GetCheckboxSize(nsIPresContext* aPresContext, float aPixToTwip) const { - nsILookAndFeel * lookAndFeel; PRInt32 checkboxSize = 0; - if (NS_OK == nsComponentManager::CreateInstance(kLookAndFeelCID, nsnull, kILookAndFeelIID, (void**)&lookAndFeel)) { + nsCOMPtr lookAndFeel; + if (NS_SUCCEEDED(aPresContext->GetLookAndFeel(getter_AddRefs(lookAndFeel)))) { lookAndFeel->GetMetric(nsILookAndFeel::eMetric_CheckboxSize, checkboxSize); - NS_RELEASE(lookAndFeel); } if (checkboxSize == 0) checkboxSize = NS_DEFAULT_CHECKBOX_SIZE; @@ -74,7 +72,7 @@ nsNativeCheckboxControlFrame::GetDesiredSize(nsIPresContext* aPresConte float p2t; aPresContext->GetScaledPixelsToTwips(&p2t); - aDesiredWidgetSize.width = GetCheckboxSize(p2t); + aDesiredWidgetSize.width = GetCheckboxSize(aPresContext, p2t); aDesiredWidgetSize.height = aDesiredWidgetSize.width; aDesiredLayoutSize.width = aDesiredWidgetSize.width; aDesiredLayoutSize.height = aDesiredWidgetSize.height; diff --git a/mozilla/layout/html/forms/src/nsNativeCheckboxControlFram.h b/mozilla/layout/html/forms/src/nsNativeCheckboxControlFram.h index b43fe09e2cc..eae598eec2f 100644 --- a/mozilla/layout/html/forms/src/nsNativeCheckboxControlFram.h +++ b/mozilla/layout/html/forms/src/nsNativeCheckboxControlFram.h @@ -39,7 +39,7 @@ protected: virtual CheckState GetCheckboxState(); virtual void SetCheckboxState(CheckState aValue); - virtual nscoord GetCheckboxSize(float aPixToTwip) const; + virtual nscoord GetCheckboxSize(nsIPresContext* aPresContext, float aPixToTwip) const; virtual void GetDesiredSize(nsIPresContext* aPresContext, const nsHTMLReflowState& aReflowState, nsHTMLReflowMetrics& aDesiredLayoutSize,