Bug 421814 - Use HITheme to draw backgrounds for groupboxes. r=josh+Mano, sr=roc, a1.9=dsicore.

This commit is contained in:
stefanh@inbox.com 2008-03-13 13:24:29 -07:00
parent 82543ff651
commit fa69f38301
6 changed files with 18 additions and 18 deletions

View File

@ -209,9 +209,7 @@ description {
}
prefpane .groupbox-body {
border: none !important;
-moz-border-radius: 0px !important;
background-image: none !important;
-moz-appearance: none;
padding: 8px 4px 4px 4px;
}

View File

@ -194,6 +194,9 @@
// The ticks for a slider.
#define NS_THEME_SCALE_TICK 117
// A groupbox
#define NS_THEME_GROUPBOX 149
// A generic container that always repaints on state
// changes. This is a hack to make checkboxes and
// radio buttons work.

View File

@ -550,6 +550,7 @@ CSS_KEY(scalethumb-vertical, scalethumb_vertical)
CSS_KEY(scalethumbstart, scalethumbstart)
CSS_KEY(scalethumbend, scalethumbend)
CSS_KEY(scalethumbtick, scalethumbtick)
CSS_KEY(groupbox, groupbox)
CSS_KEY(checkbox-container, checkboxcontainer)
CSS_KEY(radio-container, radiocontainer)
CSS_KEY(checkbox-label, checkboxlabel)

View File

@ -247,6 +247,7 @@ const PRInt32 nsCSSProps::kAppearanceKTable[] = {
eCSSKeyword_scalethumbstart, NS_THEME_SCALE_THUMB_START,
eCSSKeyword_scalethumbend, NS_THEME_SCALE_THUMB_END,
eCSSKeyword_scalethumbtick, NS_THEME_SCALE_TICK,
eCSSKeyword_groupbox, NS_THEME_GROUPBOX,
eCSSKeyword_checkboxcontainer, NS_THEME_CHECKBOX_CONTAINER,
eCSSKeyword_radiocontainer, NS_THEME_RADIO_CONTAINER,
eCSSKeyword_checkboxlabel, NS_THEME_CHECKBOX_LABEL,

View File

@ -47,27 +47,16 @@
groupbox {
padding: 5px 1px 1px 0px;
margin: 6px;
}
.groupbox-title {
/* border-bottom: 1px solid #858585; */
}
.groupbox-body {
padding: 5px 5px 0px 5px;
border: 3px solid transparent;
-moz-border-top-colors: #9b9b9b #c8c8c8 #e1e1e1 ;
-moz-border-right-colors: #c4c4c4 #e1e1e1 #e4e4e4;
-moz-border-bottom-colors: #d6d6d6 #e2e2e2 #e4e4e4;
-moz-border-left-colors: #c4c4c4 #e1e1e1 #e4e4e4;
background: url("chrome://global/skin/10pct_transparent_grey.png") repeat !important;
-moz-border-radius: 3px;
-moz-appearance: groupbox;
padding: 8px 8px 3px 8px;
margin: 0px;
}
caption {
padding: 0px 2px 1px 4px !important;
font: menu;
}
font: caption;
}

View File

@ -1038,6 +1038,12 @@ nsNativeThemeCocoa::DrawWidgetBackground(nsIRenderingContext* aContext, nsIFrame
kThemeAdornmentArrowDownArrow, eventState);
break;
case NS_THEME_GROUPBOX: {
HIThemeGroupBoxDrawInfo gdi = { 0, kThemeStateActive, kHIThemeGroupBoxKindPrimary };
HIThemeDrawGroupBox(&macRect, &gdi, cgContext, HITHEME_ORIENTATION);
break;
}
case NS_THEME_TEXTFIELD:
// HIThemeSetFill is not available on 10.3
CGContextSetRGBFillColor(cgContext, 1.0, 1.0, 1.0, 1.0);
@ -1628,6 +1634,7 @@ nsNativeThemeCocoa::WidgetStateChanged(nsIFrame* aFrame, PRUint8 aWidgetType,
case NS_THEME_TAB_PANEL:
case NS_THEME_DIALOG:
case NS_THEME_MENUPOPUP:
case NS_THEME_GROUPBOX:
*aShouldRepaint = PR_FALSE;
return NS_OK;
}
@ -1695,6 +1702,7 @@ nsNativeThemeCocoa::ThemeSupportsWidget(nsPresContext* aPresContext, nsIFrame* a
case NS_THEME_RADIO:
case NS_THEME_RADIO_SMALL:
case NS_THEME_RADIO_CONTAINER:
case NS_THEME_GROUPBOX:
case NS_THEME_BUTTON:
case NS_THEME_BUTTON_BEVEL:
case NS_THEME_SPINNER: