Bug 364396, native theming for dropmarker in Cocoa, r=josh

This commit is contained in:
enndeakin%sympatico.ca 2007-01-22 19:54:36 +00:00
Родитель 5c9081806e
Коммит be7ebc13f2
1 изменённых файлов: 6 добавлений и 10 удалений

Просмотреть файл

@ -124,7 +124,7 @@ nsNativeThemeCocoa::DrawButton(CGContextRef cgContext, ThemeButtonKind inKind,
else if ((inState & NS_EVENT_STATE_ACTIVE) && (inState & NS_EVENT_STATE_HOVER))
bdi.state = kThemeStatePressed;
else
bdi.state = kThemeStateActive;
bdi.state = (inKind == kThemeArrowButton) ? kThemeStateInactive : kThemeStateActive;
if (inState & NS_EVENT_STATE_FOCUS)
bdi.adornment |= kThemeAdornmentFocus;
@ -486,7 +486,9 @@ nsNativeThemeCocoa::DrawWidgetBackground(nsIRenderingContext* aContext, nsIFrame
break;
case NS_THEME_DROPDOWN_BUTTON:
// do nothing, this is covered by the DROPDOWN case
DrawButton (cgContext, kThemeArrowButton, macRect, PR_FALSE,
IsDisabled(aFrame), kThemeButtonOn,
kThemeAdornmentArrowDownArrow, eventState);
break;
case NS_THEME_TEXTFIELD:
@ -627,6 +629,7 @@ nsNativeThemeCocoa::GetWidgetBorder(nsIDeviceContext* aContext,
break;
case NS_THEME_DROPDOWN:
case NS_THEME_DROPDOWN_BUTTON:
aResult->SizeTo(kAquaDropdownLeftEndcap, kAquaPushButtonTopBottom,
kAquaDropwdonRightEndcap, kAquaPushButtonTopBottom);
break;
@ -738,20 +741,13 @@ nsNativeThemeCocoa::GetMinimumWidgetSize(nsIRenderingContext* aContext,
}
case NS_THEME_DROPDOWN:
case NS_THEME_DROPDOWN_BUTTON:
{
SInt32 popupHeight = 0;
::GetThemeMetric(kThemeMetricPopupButtonHeight, &popupHeight);
aResult->SizeTo(0, popupHeight);
break;
}
case NS_THEME_DROPDOWN_BUTTON:
{
// the drawing for this is done by the dropdown, so just make this
// zero sized.
aResult->SizeTo(0,0);
break;
}
case NS_THEME_TEXTFIELD:
{