Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 05:15:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove theme constant overrides. b=372996 r=smorgan sr=vlad

Browse Source
This commit is contained in:
joshmoz%gmail.com 2007-03-13 21:07:41 +00:00
parent 92fad7dd3a
commit 64777640f2
1 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
widget/src/cocoa/nsNativeThemeCocoa.mm
View File

@ -67,16 +67,10 @@ extern "C" {
NS_IMPL_ISUPPORTS1(nsNativeThemeCocoa, nsITheme)
static PRBool sInitializedBorders = PR_FALSE;
nsNativeThemeCocoa::nsNativeThemeCocoa()
{
if (!sInitializedBorders) {
sInitializedBorders = PR_TRUE;
sTextfieldBGTransparent = PR_FALSE;
sListboxBGTransparent = PR_TRUE;
sTextfieldDisabledBGColorID = nsILookAndFeel::eColor__moz_field;
}
sListboxBGTransparent = PR_TRUE;
}
nsNativeThemeCocoa::~nsNativeThemeCocoa()
@ -454,10 +448,6 @@ nsNativeThemeCocoa::DrawWidgetBackground(nsIRenderingContext* aContext, nsIFrame
DrawCheckboxRadio(cgContext, kThemeCheckBox, macRect, IsChecked(aFrame), IsDisabled(aFrame), eventState);
break;
case NS_THEME_RADIO:
DrawCheckboxRadio(cgContext, kThemeRadioButton, macRect, IsSelected(aFrame), IsDisabled(aFrame), eventState);
break;
case NS_THEME_CHECKBOX_SMALL:
if (aRect.height == 15) {
// draw at 14x16, see comment in GetMinimumWidgetSize
@ -467,6 +457,10 @@ nsNativeThemeCocoa::DrawWidgetBackground(nsIRenderingContext* aContext, nsIFrame
DrawCheckboxRadio(cgContext, kThemeSmallCheckBox, macRect, IsChecked(aFrame), IsDisabled(aFrame), eventState);
break;
case NS_THEME_RADIO:
DrawCheckboxRadio(cgContext, kThemeRadioButton, macRect, IsSelected(aFrame), IsDisabled(aFrame), eventState);
break;
case NS_THEME_RADIO_SMALL:
if (aRect.height == 14) {
// draw at 14x15, see comment in GetMinimumWidgetSize
@ -826,16 +820,6 @@ nsNativeThemeCocoa::GetMinimumWidgetSize(nsIRenderingContext* aContext,
*aIsOverridable = PR_FALSE;
break;
}
case NS_THEME_RADIO:
{
SInt32 radioHeight = 0, radioWidth = 0;
::GetThemeMetric(kThemeMetricRadioButtonWidth, &radioWidth);
::GetThemeMetric(kThemeMetricRadioButtonHeight, &radioHeight);
aResult->SizeTo(radioWidth, radioHeight);
*aIsOverridable = PR_FALSE;
break;
}
case NS_THEME_CHECKBOX_SMALL:
{
@ -852,6 +836,16 @@ nsNativeThemeCocoa::GetMinimumWidgetSize(nsIRenderingContext* aContext,
break;
}
case NS_THEME_RADIO:
{
SInt32 radioHeight = 0, radioWidth = 0;
::GetThemeMetric(kThemeMetricRadioButtonWidth, &radioWidth);
::GetThemeMetric(kThemeMetricRadioButtonHeight, &radioHeight);
aResult->SizeTo(radioWidth, radioHeight);
*aIsOverridable = PR_FALSE;
break;
}
case NS_THEME_RADIO_SMALL:
{
// Same as above, but appearance manager reports 14x15, and we