mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Lots of fixes for native themed checkbox and radio buttons on gtk2. Bug 247631, r=caillon, sr=blizzard.

This commit is contained in:
bryner%brianryner.com 2004-06-22 22:10:12 +00:00
Родитель 12a56a1d51
Коммит 4f06ee6e85
22 изменённых файлов: 1106 добавлений и 288 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
content/shared/public/nsCSSKeywordList.h
Просмотреть файл

@ -501,6 +501,8 @@ CSS_KEY(sliderthumbend, sliderthumbend)
CSS_KEY(sliderthumbtick, sliderthumbtick)
CSS_KEY(checkbox-container, checkboxcontainer)
CSS_KEY(radio-container, radiocontainer)
CSS_KEY(checkbox-label, checkboxlabel)
CSS_KEY(radio-label, radiolabel)
#ifdef MOZ_SVG
//CSS_KEY(all, all)

2
content/shared/src/nsCSSProps.cpp
Просмотреть файл

@ -228,6 +228,8 @@ const PRInt32 nsCSSProps::kAppearanceKTable[] = {
eCSSKeyword_sliderthumbtick, NS_THEME_SLIDER_TICK,
eCSSKeyword_checkboxcontainer, NS_THEME_CHECKBOX_CONTAINER,
eCSSKeyword_radiocontainer, NS_THEME_RADIO_CONTAINER,
eCSSKeyword_checkboxlabel, NS_THEME_CHECKBOX_LABEL,
eCSSKeyword_radiolabel, NS_THEME_RADIO_LABEL,
eCSSKeyword_window, NS_THEME_WINDOW,
eCSSKeyword_dialog, NS_THEME_DIALOG,
eCSSKeyword_menubar, NS_THEME_MENUBAR,

5
gfx/public/nsThemeConstants.h
Просмотреть файл

@ -185,6 +185,11 @@
#define NS_THEME_CHECKBOX_CONTAINER 150
#define NS_THEME_RADIO_CONTAINER 151
// The label part of a checkbox or radio button, used for painting
// a focus outline.
#define NS_THEME_CHECKBOX_LABEL 152
#define NS_THEME_RADIO_LABEL 153
// Window and dialog backgrounds
#define NS_THEME_WINDOW 200
#define NS_THEME_DIALOG 201

256
gfx/src/gtk/gtk2drawing.c
Просмотреть файл

@ -408,33 +408,53 @@ moz_gtk_checkbox_get_metrics(gint* indicator_size, gint* indicator_spacing)
{
ensure_checkbox_widget();
if (indicator_size) {
gtk_widget_style_get (gCheckboxWidget, "indicator_size",
indicator_size, NULL);
}
if (indicator_spacing) {
gtk_widget_style_get (gCheckboxWidget, "indicator_spacing",
indicator_spacing, NULL);
}
gtk_widget_style_get (gCheckboxWidget,
"indicator_size", indicator_size,
"indicator_spacing", indicator_spacing,
NULL);
return MOZ_GTK_SUCCESS;
}
gint
moz_gtk_radiobutton_get_metrics(gint* indicator_size, gint* indicator_spacing)
moz_gtk_radio_get_metrics(gint* indicator_size, gint* indicator_spacing)
{
ensure_radiobutton_widget();
if (indicator_size) {
gtk_widget_style_get (gRadiobuttonWidget, "indicator_size",
indicator_size, NULL);
}
gtk_widget_style_get (gRadiobuttonWidget,
"indicator_size", indicator_size,
"indicator_spacing", indicator_spacing,
NULL);
if (indicator_spacing) {
gtk_widget_style_get (gRadiobuttonWidget, "indicator_spacing",
indicator_spacing, NULL);
}
return MOZ_GTK_SUCCESS;
}
gint
moz_gtk_checkbox_get_focus(gboolean* interior_focus,
gint* focus_width, gint* focus_pad)
{
ensure_checkbox_widget();
gtk_widget_style_get (gCheckboxWidget,
"interior-focus", interior_focus,
"focus-line-width", focus_width,
"focus-padding", focus_pad,
NULL);
return MOZ_GTK_SUCCESS;
}
gint
moz_gtk_radio_get_focus(gboolean* interior_focus,
gint* focus_width, gint* focus_pad)
{
ensure_radiobutton_widget();
gtk_widget_style_get (gRadiobuttonWidget,
"interior-focus", interior_focus,
"focus-line-width", focus_width,
"focus-padding", focus_pad,
NULL);
return MOZ_GTK_SUCCESS;
}
@ -446,35 +466,35 @@ moz_gtk_toggle_paint(GdkDrawable* drawable, GdkRectangle* rect,
{
GtkStateType state_type = ConvertGtkState(state);
GtkShadowType shadow_type = (selected)?GTK_SHADOW_IN:GTK_SHADOW_OUT;
gint indicator_size;
gint indicator_size, indicator_spacing;
gint x, y, width, height;
GtkStyle* style;
GtkWidget *w;
GtkStyle *style;
if (isradio) {
moz_gtk_radiobutton_get_metrics(&indicator_size, NULL);
style = gRadiobuttonWidget->style;
moz_gtk_radio_get_metrics(&indicator_size, &indicator_spacing);
w = gRadiobuttonWidget;
} else {
moz_gtk_checkbox_get_metrics(&indicator_size, NULL);
style = gCheckboxWidget->style;
moz_gtk_checkbox_get_metrics(&indicator_size, &indicator_spacing);
w = gCheckboxWidget;
}
/* centered within the rect */
x = rect->x + (rect->width - indicator_size) / 2;
/* offset by indicator_spacing, and centered vertically within the rect */
x = rect->x + indicator_spacing;
y = rect->y + (rect->height - indicator_size) / 2;
width = indicator_size;
height = indicator_size;
style = w->style;
TSOffsetStyleGCs(style, x, y);
/* Some themes check the widget state themselves. */
if (isradio) {
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gRadiobuttonWidget),
selected);
}
else {
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gCheckboxWidget),
selected);
}
if (state->focused)
GTK_WIDGET_SET_FLAGS(w, GTK_HAS_FOCUS);
else
GTK_WIDGET_UNSET_FLAGS(w, GTK_HAS_FOCUS);
GTK_TOGGLE_BUTTON(w)->active = selected;
if (isradio) {
gtk_paint_option(style, drawable, state_type, shadow_type, cliprect,
@ -779,17 +799,24 @@ moz_gtk_container_paint(GdkDrawable* drawable, GdkRectangle* rect,
{
GtkStateType state_type = ConvertGtkState(state);
GtkStyle* style;
gboolean interior_focus;
gint focus_width, focus_pad;
if (isradio) {
ensure_radiobutton_widget();
style = gRadiobuttonWidget->style;
moz_gtk_radio_get_focus(&interior_focus, &focus_width, &focus_pad);
} else {
ensure_checkbox_widget();
style = gCheckboxWidget->style;
moz_gtk_checkbox_get_focus(&interior_focus, &focus_width, &focus_pad);
}
TSOffsetStyleGCs(style, rect->x, rect->y);
/* The detail argument for the gtk_paint_* calls below are "checkbutton"
even for radio buttons, to match what gtk does. */
/* this is for drawing a prelight box */
if (state_type == GTK_STATE_PRELIGHT || state_type == GTK_STATE_ACTIVE) {
gtk_paint_flat_box(style, drawable, GTK_STATE_PRELIGHT, GTK_SHADOW_ETCHED_OUT,
@ -801,15 +828,53 @@ moz_gtk_container_paint(GdkDrawable* drawable, GdkRectangle* rect,
if (state_type != GTK_STATE_NORMAL && state_type != GTK_STATE_PRELIGHT)
state_type = GTK_STATE_NORMAL;
if (state->focused) {
if (state->focused && !interior_focus) {
gtk_paint_focus(style, drawable, state_type, cliprect, gCheckboxWidget,
isradio ? "radiobutton" : "checkbutton",
"checkbutton",
rect->x, rect->y, rect->width, rect->height);
}
return MOZ_GTK_SUCCESS;
}
static gint
moz_gtk_toggle_label_paint(GdkDrawable* drawable, GdkRectangle* rect,
GdkRectangle* cliprect, GtkWidgetState* state,
gboolean isradio)
{
GtkStateType state_type;
GtkStyle *style;
GtkWidget *widget;
gboolean interior_focus;
if (!state->focused)
return MOZ_GTK_SUCCESS;
if (isradio) {
ensure_radiobutton_widget();
widget = gRadiobuttonWidget;
} else {
ensure_checkbox_widget();
widget = gCheckboxWidget;
}
gtk_widget_style_get(widget, "interior-focus", &interior_focus, NULL);
if (!interior_focus)
return MOZ_GTK_SUCCESS;
state_type = ConvertGtkState(state);
style = widget->style;
TSOffsetStyleGCs(style, rect->x, rect->y);
/* Always "checkbutton" to match gtkcheckbutton.c */
gtk_paint_focus(style, drawable, state_type, cliprect, widget,
"checkbutton",
rect->x, rect->y, rect->width, rect->height);
return MOZ_GTK_SUCCESS;
}
static gint
moz_gtk_toolbar_paint(GdkDrawable* drawable, GdkRectangle* rect,
GdkRectangle* cliprect)
@ -1110,15 +1175,57 @@ moz_gtk_get_widget_border(GtkThemeWidgetType widget, gint* xthickness,
ensure_frame_widget();
w = gFrameWidget;
break;
case MOZ_GTK_CHECKBUTTON_LABEL:
case MOZ_GTK_RADIOBUTTON_LABEL:
{
gboolean interior_focus;
gint focus_width, focus_pad;
/* If the focus is interior, then the label has a border of
(focus_width + focus_pad). */
if (widget == MOZ_GTK_CHECKBUTTON_LABEL)
moz_gtk_checkbox_get_focus(&interior_focus,
&focus_width, &focus_pad);
else
moz_gtk_radio_get_focus(&interior_focus,
&focus_width, &focus_pad);
if (interior_focus)
*xthickness = *ythickness = (focus_width + focus_pad);
else
*xthickness = *ythickness = 0;
return MOZ_GTK_SUCCESS;
}
case MOZ_GTK_CHECKBUTTON_CONTAINER:
case MOZ_GTK_RADIOBUTTON_CONTAINER:
/* This is a hardcoded value. */
if (xthickness)
*xthickness = 1;
if (ythickness)
*ythickness = 1;
return MOZ_GTK_SUCCESS;
break;
{
gboolean interior_focus;
gint focus_width, focus_pad;
/* If the focus is _not_ interior, then the container has a border
of (focus_width + focus_pad). */
if (widget == MOZ_GTK_CHECKBUTTON_CONTAINER) {
w = gCheckboxWidget;
moz_gtk_checkbox_get_focus(&interior_focus,
&focus_width, &focus_pad);
} else {
w = gRadiobuttonWidget;
moz_gtk_radio_get_focus(&interior_focus,
&focus_width, &focus_pad);
}
*xthickness = *ythickness = GTK_CONTAINER(w)->border_width;
if (!interior_focus) {
*xthickness += (focus_width + focus_pad);
*ythickness += (focus_width + focus_pad);
}
return MOZ_GTK_SUCCESS;
}
case MOZ_GTK_MENUBAR:
ensure_menu_bar_widget();
w = gMenuBarWidget;
@ -1145,20 +1252,15 @@ moz_gtk_get_widget_border(GtkThemeWidgetType widget, gint* xthickness,
/* These widgets have no borders.*/
case MOZ_GTK_TOOLTIP:
case MOZ_GTK_WINDOW:
if (xthickness)
*xthickness = 0;
if (ythickness)
*ythickness = 0;
*xthickness = *ythickness = 0;
return MOZ_GTK_SUCCESS;
default:
g_warning("Unsupported widget type: %d", widget);
return MOZ_GTK_UNKNOWN_WIDGET;
}
if (xthickness)
*xthickness = XTHICKNESS(w->style);
if (ythickness)
*ythickness = YTHICKNESS(w->style);
*xthickness = XTHICKNESS(w->style);
*ythickness = YTHICKNESS(w->style);
return MOZ_GTK_SUCCESS;
}
@ -1174,48 +1276,29 @@ moz_gtk_get_dropdown_arrow_size(gint* width, gint* height)
* 11 pixels.
*/
if (width) {
*width = 2 * (1 + XTHICKNESS(gDropdownButtonWidget->style));
*width += 11 + GTK_MISC(gArrowWidget)->xpad * 2;
}
if (height) {
*height = 2 * (1 + YTHICKNESS(gDropdownButtonWidget->style));
*height += 11 + GTK_MISC(gArrowWidget)->ypad * 2;
}
*width = 2 * (1 + XTHICKNESS(gDropdownButtonWidget->style));
*width += 11 + GTK_MISC(gArrowWidget)->xpad * 2;
*height = 2 * (1 + YTHICKNESS(gDropdownButtonWidget->style));
*height += 11 + GTK_MISC(gArrowWidget)->ypad * 2;
return MOZ_GTK_SUCCESS;
}
gint
moz_gtk_get_scrollbar_metrics(gint* slider_width, gint* trough_border,
gint* stepper_size, gint* stepper_spacing,
gint* min_slider_size)
moz_gtk_get_scrollbar_metrics(MozGtkScrollbarMetrics *metrics)
{
ensure_scrollbar_widget();
if (slider_width) {
gtk_widget_style_get (gHorizScrollbarWidget, "slider_width",
slider_width, NULL);
}
gtk_widget_style_get (gHorizScrollbarWidget,
"slider_width", &metrics->slider_width,
"trough_border", &metrics->trough_border,
"stepper_size", &metrics->stepper_size,
"stepper_spacing", &metrics->stepper_spacing,
NULL);
if (trough_border) {
gtk_widget_style_get (gHorizScrollbarWidget, "trough_border",
trough_border, NULL);
}
if (stepper_size) {
gtk_widget_style_get (gHorizScrollbarWidget, "stepper_size",
stepper_size, NULL);
}
if (stepper_spacing) {
gtk_widget_style_get (gHorizScrollbarWidget, "stepper_spacing",
stepper_spacing, NULL);
}
if (min_slider_size) {
*min_slider_size = GTK_RANGE(gHorizScrollbarWidget)->min_slider_size;
}
metrics->min_slider_size =
GTK_RANGE(gHorizScrollbarWidget)->min_slider_size;
return MOZ_GTK_SUCCESS;
}
@ -1265,6 +1348,11 @@ moz_gtk_widget_paint(GtkThemeWidgetType widget, GdkDrawable* drawable,
return moz_gtk_container_paint(drawable, rect, cliprect, state,
(widget == MOZ_GTK_RADIOBUTTON_CONTAINER));
break;
case MOZ_GTK_CHECKBUTTON_LABEL:
case MOZ_GTK_RADIOBUTTON_LABEL:
return moz_gtk_toggle_label_paint(drawable, rect, cliprect, state,
(widget == MOZ_GTK_RADIOBUTTON_LABEL));
break;
case MOZ_GTK_TOOLBAR:
return moz_gtk_toolbar_paint(drawable, rect, cliprect);
break;

141
gfx/src/gtk/gtkdrawing.c
Просмотреть файл

@ -351,24 +351,44 @@ moz_gtk_checkbox_get_metrics(gint* indicator_size, gint* indicator_spacing)
GtkStyle* style = gCheckboxWidget->style;
if (indicator_size)
*indicator_size = style_prop_func(style,
"GtkCheckButton::indicator_size",
klass->indicator_size);
if (indicator_spacing)
*indicator_spacing = style_prop_func(style,
"GtkCheckButton::indicator_spacing",
klass->indicator_spacing);
*indicator_size = style_prop_func(style,
"GtkCheckButton::indicator_size",
klass->indicator_size);
*indicator_spacing = style_prop_func(style,
"GtkCheckButton::indicator_spacing",
klass->indicator_spacing);
} else {
if (indicator_size)
*indicator_size = klass->indicator_size;
if (indicator_spacing)
*indicator_spacing = klass->indicator_spacing;
*indicator_size = klass->indicator_size;
*indicator_spacing = klass->indicator_spacing;
}
return MOZ_GTK_SUCCESS;
}
gint
moz_gtk_radio_get_metrics(gint* indicator_size, gint* indicator_spacing)
{
return moz_gtk_checkbox_get_metrics(indicator_size, indicator_spacing);
}
gint
moz_gtk_checkbox_get_focus(gboolean* interior_focus,
gint* focus_width, gint* focus_pad)
{
/* These values are hardcoded in gtk1. */
*interior_focus = FALSE;
*focus_width = 1;
*focus_pad = 0;
return MOZ_GTK_SUCCESS;
}
gint
moz_gtk_radio_get_focus(gboolean* interior_focus,
gint* focus_width, gint* focus_pad)
{
return moz_gtk_checkbox_get_focus(interior_focus, focus_width, focus_pad);
}
static gint
moz_gtk_toggle_paint(GdkDrawable* drawable, GdkRectangle* rect,
GdkRectangle* cliprect, GtkWidgetState* state,
@ -376,15 +396,15 @@ moz_gtk_toggle_paint(GdkDrawable* drawable, GdkRectangle* rect,
{
GtkStateType state_type;
GtkShadowType shadow_type;
gint indicator_size;
gint indicator_size, indicator_spacing;
gint x, y, width, height;
GtkStyle* style;
moz_gtk_checkbox_get_metrics(&indicator_size, NULL);
moz_gtk_checkbox_get_metrics(&indicator_size, &indicator_spacing);
style = gCheckboxWidget->style;
/* centered within the rect */
x = rect->x + (rect->width - indicator_size) / 2;
/* offset by indicator_spacing, and centered vertically within the rect */
x = rect->x + indicator_spacing;
y = rect->y + (rect->height - indicator_size) / 2;
width = indicator_size;
height = indicator_size;
@ -833,13 +853,17 @@ moz_gtk_get_widget_border(GtkThemeWidgetType widget, gint* xthickness,
break;
case MOZ_GTK_CHECKBUTTON_CONTAINER:
case MOZ_GTK_RADIOBUTTON_CONTAINER:
/* This is a hardcoded value. */
if (xthickness)
*xthickness = 1;
if (ythickness)
*ythickness = 1;
ensure_checkbox_widget();
*xthickness = *ythickness =
GTK_CONTAINER(gCheckboxWidget)->border_width + 1;
return MOZ_GTK_SUCCESS;
break;
case MOZ_GTK_CHECKBUTTON_LABEL:
case MOZ_GTK_RADIOBUTTON_LABEL:
*xthickness = *ythickness = 0;
return MOZ_GTK_SUCCESS;
case MOZ_GTK_CHECKBUTTON:
case MOZ_GTK_RADIOBUTTON:
case MOZ_GTK_SCROLLBAR_BUTTON:
@ -852,20 +876,16 @@ moz_gtk_get_widget_border(GtkThemeWidgetType widget, gint* xthickness,
case MOZ_GTK_PROGRESS_CHUNK:
case MOZ_GTK_TAB:
/* These widgets have no borders, since they are not containers. */
if (xthickness)
*xthickness = 0;
if (ythickness)
*ythickness = 0;
*xthickness = 0;
*ythickness = 0;
return MOZ_GTK_SUCCESS;
default:
g_warning("Unsupported widget type: %d", widget);
return MOZ_GTK_UNKNOWN_WIDGET;
}
if (xthickness)
*xthickness = w->style->klass->xthickness;
if (ythickness)
*ythickness = w->style->klass->ythickness;
*xthickness = w->style->klass->xthickness;
*ythickness = w->style->klass->ythickness;
return MOZ_GTK_SUCCESS;
}
@ -881,22 +901,17 @@ moz_gtk_get_dropdown_arrow_size(gint* width, gint* height)
* 11 pixels.
*/
if (width) {
*width = 2 * (1 + gDropdownButtonWidget->style->klass->xthickness);
*width += 11 + GTK_MISC(gArrowWidget)->xpad * 2;
}
if (height) {
*height = 2 * (1 + gDropdownButtonWidget->style->klass->ythickness);
*height += 11 + GTK_MISC(gArrowWidget)->ypad * 2;
}
*width = 2 * (1 + gDropdownButtonWidget->style->klass->xthickness);
*width += 11 + GTK_MISC(gArrowWidget)->xpad * 2;
*height = 2 * (1 + gDropdownButtonWidget->style->klass->ythickness);
*height += 11 + GTK_MISC(gArrowWidget)->ypad * 2;
return MOZ_GTK_SUCCESS;
}
gint
moz_gtk_get_scrollbar_metrics(gint* slider_width, gint* trough_border,
gint* stepper_size, gint* stepper_spacing,
gint* min_slider_size)
moz_gtk_get_scrollbar_metrics(MozGtkScrollbarMetrics *metrics)
{
GtkRangeClass* klass;
GtkStyle* style;
@ -910,41 +925,30 @@ moz_gtk_get_scrollbar_metrics(gint* slider_width, gint* trough_border,
* This API is supported only in GTK+ >= 1.2.9, and gives per-theme values.
*/
if (slider_width)
*slider_width = style_prop_func(style, "GtkRange::slider_width",
klass->slider_width);
metrics->slider_width = style_prop_func(style, "GtkRange::slider_width",
klass->slider_width);
if (trough_border)
*trough_border = style_prop_func(style, "GtkRange::trough_border",
style->klass->xthickness);
metrics->trough_border = style_prop_func(style, "GtkRange::trough_border",
style->klass->xthickness);
if (stepper_size)
*stepper_size = style_prop_func(style, "GtkRange::stepper_size",
klass->stepper_size);
metrics->stepper_size = style_prop_func(style, "GtkRange::stepper_size",
klass->stepper_size);
if (stepper_spacing)
*stepper_spacing = style_prop_func(style, "GtkRange::stepper_spacing",
klass->stepper_slider_spacing);
metrics->stepper_spacing = style_prop_func(style,
"GtkRange::stepper_spacing",
klass->stepper_slider_spacing);
} else {
/*
* This is the older method, which gives per-engine values.
*/
if (slider_width)
*slider_width = klass->slider_width;
if (trough_border)
*trough_border = style->klass->xthickness;
if (stepper_size)
*stepper_size = klass->stepper_size;
if (stepper_spacing)
*stepper_spacing = klass->stepper_slider_spacing;
metrics->slider_width = klass->slider_width;
metrics->trough_border = style->klass->xthickness;
metrics->stepper_size = klass->stepper_size;
metrics->stepper_spacing = klass->stepper_slider_spacing;
}
if (min_slider_size)
*min_slider_size = klass->min_slider_size;
metrics->min_slider_size = klass->min_slider_size;
return MOZ_GTK_SUCCESS;
}
@ -1013,6 +1017,11 @@ moz_gtk_widget_paint(GtkThemeWidgetType widget, GdkDrawable* drawable,
case MOZ_GTK_TABPANELS:
return moz_gtk_tabpanels_paint(drawable, rect, cliprect);
break;
case MOZ_GTK_CHECKBUTTON_LABEL:
case MOZ_GTK_RADIOBUTTON_LABEL:
/* We only support these so that we can prevent the CSS border
from being drawn. */
return MOZ_GTK_SUCCESS;
default:
g_warning("Unknown widget type: %d", widget);
}

44
gfx/src/gtk/gtkdrawing.h
Просмотреть файл

@ -67,6 +67,14 @@ typedef struct {
gint32 maxpos;
} GtkWidgetState;
typedef struct {
gint slider_width;
gint trough_border;
gint stepper_size;
gint stepper_spacing;
gint min_slider_size;
} MozGtkScrollbarMetrics;
/** flags for tab state **/
typedef enum {
/* the first tab in the group */
@ -114,6 +122,10 @@ typedef enum {
MOZ_GTK_CHECKBUTTON_CONTAINER,
/* Paints the container part of a GtkRadioButton. */
MOZ_GTK_RADIOBUTTON_CONTAINER,
/* Paints the label of a GtkCheckButton (focus outline) */
MOZ_GTK_CHECKBUTTON_LABEL,
/* Paints the label of a GtkRadioButton (focus outline) */
MOZ_GTK_RADIOBUTTON_LABEL,
/* Paints the background of a GtkHandleBox. */
MOZ_GTK_TOOLBAR,
/* Paints a GtkToolTip */
@ -211,22 +223,32 @@ moz_gtk_checkbox_get_metrics(gint* indicator_size, gint* indicator_spacing);
*
* returns: MOZ_GTK_SUCCESS if there was no error, an error code otherwise
*/
#define moz_gtk_radio_get_metrics(x, y) moz_gtk_checkbox_get_metrics(x, y)
gint
moz_gtk_radio_get_metrics(gint* indicator_size, gint* indicator_spacing);
/**
* Get the desired metrics for a GtkScrollbar
* slider_width: [OUT] the width of the slider (thumb)
* trough_border: [OUT] the border of the trough (outside the thumb)
* stepper_size: [OUT] the size of an arrow button
* stepper_spacing: [OUT] the minimum space between the thumb and the arrow
* min_slider_size: [OUT] the minimum thumb size
/** Get the focus metrics for a checkbox or radio button
* interior_focus: [OUT] whether the focus is drawn around the
* label (TRUE) or around the whole container (FALSE)
* focus_width: [OUT] the width of the focus line
* focus_pad: [OUT] the padding between the focus line and children
*
* returns: MOZ_GTK_SUCCESS if there was no error, an error code otherwise
*/
gint
moz_gtk_get_scrollbar_metrics(gint* slider_width, gint* trough_border,
gint* stepper_size, gint* stepper_spacing,
gint* min_slider_size);
moz_gtk_checkbox_get_focus(gboolean* interior_focus,
gint* focus_width, gint* focus_pad);
gint
moz_gtk_radio_get_focus(gboolean* interior_focus,
gint* focus_width, gint* focus_pad);
/**
* Get the desired metrics for a GtkScrollbar
* metrics: [IN] struct which will contain the metrics
*
* returns: MOZ_GTK_SUCCESS if there was no error, an error code otherwise
*/
gint
moz_gtk_get_scrollbar_metrics(MozGtkScrollbarMetrics* metrics);
/**
* Get the desired size of a dropdown arrow button

92
gfx/src/gtk/nsNativeThemeGTK.cpp
Просмотреть файл

@ -251,20 +251,26 @@ nsNativeThemeGTK::GetGtkWidgetAndState(PRUint8 aWidgetType, nsIFrame* aFrame,
aFrame = aFrame->GetParent();
// For XUL checkboxes and radio buttons, the state of the parent
// determines our state.
if (aWidgetType == NS_THEME_CHECKBOX || aWidgetType == NS_THEME_RADIO) {
if (aWidgetType == NS_THEME_CHECKBOX || aWidgetType == NS_THEME_RADIO ||
aWidgetType == NS_THEME_CHECKBOX_LABEL ||
aWidgetType == NS_THEME_RADIO_LABEL) {
if (aWidgetFlags) {
nsIAtom* atom = nsnull;
if (aFrame) {
nsIContent* content = aFrame->GetContent();
if (content->IsContentOfType(nsIContent::eXUL))
if (content->IsContentOfType(nsIContent::eXUL)) {
aFrame = aFrame->GetParent();
if (aWidgetType == NS_THEME_CHECKBOX_LABEL ||
aWidgetType == NS_THEME_RADIO_LABEL)
aFrame = aFrame->GetParent();
}
else if (content->Tag() == mInputAtom)
atom = mInputCheckedAtom;
}
if (!atom)
atom = (aWidgetType == NS_THEME_CHECKBOX) ? mCheckedAtom : mSelectedAtom;
atom = (aWidgetType == NS_THEME_CHECKBOX || aWidgetType == NS_THEME_CHECKBOX_LABEL) ? mCheckedAtom : mSelectedAtom;
*aWidgetFlags = CheckBooleanAttr(aFrame, atom);
}
}
@ -278,9 +284,14 @@ nsNativeThemeGTK::GetGtkWidgetAndState(PRUint8 aWidgetType, nsIFrame* aFrame,
aState->isDefault = FALSE; // XXX fix me
aState->canDefault = FALSE; // XXX fix me
// For these widget types, some element (either a child or parent)
// actually has element focus, so we check the focused attribute
// to see whether to draw in the focused state.
if (aWidgetType == NS_THEME_TEXTFIELD ||
aWidgetType == NS_THEME_DROPDOWN_TEXTFIELD ||
aWidgetType == NS_THEME_RADIO_CONTAINER) {
aWidgetType == NS_THEME_RADIO_CONTAINER ||
aWidgetType == NS_THEME_RADIO_LABEL ||
aWidgetType == NS_THEME_RADIO) {
aState->focused = CheckBooleanAttr(aFrame, mFocusedAtom);
}
@ -371,6 +382,12 @@ nsNativeThemeGTK::GetGtkWidgetAndState(PRUint8 aWidgetType, nsIFrame* aFrame,
case NS_THEME_RADIO_CONTAINER:
aGtkWidgetType = MOZ_GTK_RADIOBUTTON_CONTAINER;
break;
case NS_THEME_CHECKBOX_LABEL:
aGtkWidgetType = MOZ_GTK_CHECKBUTTON_LABEL;
break;
case NS_THEME_RADIO_LABEL:
aGtkWidgetType = MOZ_GTK_RADIOBUTTON_LABEL;
break;
case NS_THEME_TOOLBAR:
aGtkWidgetType = MOZ_GTK_TOOLBAR;
break;
@ -512,10 +529,9 @@ nsNativeThemeGTK::GetWidgetBorder(nsIDeviceContext* aContext, nsIFrame* aFrame,
case NS_THEME_SCROLLBAR_TRACK_VERTICAL:
case NS_THEME_SCROLLBAR_TRACK_HORIZONTAL:
{
gint trough_border;
moz_gtk_get_scrollbar_metrics(nsnull, &trough_border,
nsnull, nsnull, nsnull);
aResult->top = aResult->left = trough_border;
MozGtkScrollbarMetrics metrics;
moz_gtk_get_scrollbar_metrics(&metrics);
aResult->top = aResult->left = metrics.trough_border;
}
break;
case NS_THEME_TOOLBOX:
@ -535,6 +551,7 @@ nsNativeThemeGTK::GetWidgetBorder(nsIDeviceContext* aContext, nsIFrame* aFrame,
aResult->right = aResult->left;
aResult->bottom = aResult->top;
return NS_OK;
}
@ -552,28 +569,26 @@ nsNativeThemeGTK::GetMinimumWidgetSize(nsIRenderingContext* aContext,
case NS_THEME_SCROLLBAR_BUTTON_LEFT:
case NS_THEME_SCROLLBAR_BUTTON_RIGHT:
{
gint slider_width, stepper_size;
moz_gtk_get_scrollbar_metrics(&slider_width, nsnull, &stepper_size,
nsnull, nsnull);
MozGtkScrollbarMetrics metrics;
moz_gtk_get_scrollbar_metrics(&metrics);
aResult->width = slider_width;
aResult->height = stepper_size;
aResult->width = metrics.slider_width;
aResult->height = metrics.stepper_size;
*aIsOverridable = PR_FALSE;
}
break;
case NS_THEME_SCROLLBAR_THUMB_VERTICAL:
case NS_THEME_SCROLLBAR_THUMB_HORIZONTAL:
{
gint slider_width, min_slider_size;
moz_gtk_get_scrollbar_metrics(&slider_width, nsnull, nsnull, nsnull,
&min_slider_size);
MozGtkScrollbarMetrics metrics;
moz_gtk_get_scrollbar_metrics(&metrics);
if (aWidgetType == NS_THEME_SCROLLBAR_THUMB_VERTICAL) {
aResult->width = slider_width;
aResult->height = min_slider_size;
aResult->width = metrics.slider_width;
aResult->height = metrics.min_slider_size;
} else {
aResult->width = min_slider_size;
aResult->height = slider_width;
aResult->width = metrics.min_slider_size;
aResult->height = metrics.slider_width;
}
*aIsOverridable = PR_FALSE;
@ -581,31 +596,44 @@ nsNativeThemeGTK::GetMinimumWidgetSize(nsIRenderingContext* aContext,
break;
case NS_THEME_DROPDOWN_BUTTON:
{
// First, get the minimum size for the button itself.
moz_gtk_get_dropdown_arrow_size(&aResult->width, &aResult->height);
*aIsOverridable = PR_FALSE;
}
break;
case NS_THEME_CHECKBOX:
case NS_THEME_RADIO:
case NS_THEME_CHECKBOX_CONTAINER:
case NS_THEME_RADIO_CONTAINER:
{
gint indicator_size, indicator_spacing;
if (aWidgetType == NS_THEME_CHECKBOX ||
aWidgetType == NS_THEME_CHECKBOX_CONTAINER)
if (aWidgetType == NS_THEME_CHECKBOX) {
moz_gtk_checkbox_get_metrics(&indicator_size, &indicator_spacing);
else
} else {
moz_gtk_radio_get_metrics(&indicator_size, &indicator_spacing);
}
// Hack alert: several themes have indicators larger than the default
// 10px size, but don't set the indicator size property. So, leave
// a little slop room by making the minimum size 14px.
aResult->width = aResult->height = MAX(indicator_size, 14);
// Include space for the indicator and the padding around it.
aResult->width = indicator_size + 3 * indicator_spacing;
aResult->height = indicator_size + 2 * indicator_spacing;
*aIsOverridable = PR_FALSE;
}
break;
case NS_THEME_CHECKBOX_CONTAINER:
case NS_THEME_RADIO_CONTAINER:
case NS_THEME_CHECKBOX_LABEL:
case NS_THEME_RADIO_LABEL:
{
// Just include our border, and let the box code augment the size.
nsCOMPtr<nsIDeviceContext> dc;
aContext->GetDeviceContext(*getter_AddRefs(dc));
nsMargin border;
nsNativeThemeGTK::GetWidgetBorder(dc, aFrame, aWidgetType, &border);
aResult->width = border.left + border.right;
aResult->height = border.top + border.bottom;
}
break;
}
return NS_OK;
@ -737,6 +765,8 @@ nsNativeThemeGTK::ThemeSupportsWidget(nsIPresContext* aPresContext,
// case NS_THEME_SLIDER_TICK:
case NS_THEME_CHECKBOX_CONTAINER:
case NS_THEME_RADIO_CONTAINER:
case NS_THEME_CHECKBOX_LABEL:
case NS_THEME_RADIO_LABEL:
#ifdef MOZ_WIDGET_GTK2
case NS_THEME_MENUBAR:
case NS_THEME_MENUPOPUP:

2
layout/style/nsCSSKeywordList.h
Просмотреть файл

@ -501,6 +501,8 @@ CSS_KEY(sliderthumbend, sliderthumbend)
CSS_KEY(sliderthumbtick, sliderthumbtick)
CSS_KEY(checkbox-container, checkboxcontainer)
CSS_KEY(radio-container, radiocontainer)
CSS_KEY(checkbox-label, checkboxlabel)
CSS_KEY(radio-label, radiolabel)
#ifdef MOZ_SVG
//CSS_KEY(all, all)

2
layout/style/nsCSSProps.cpp
Просмотреть файл

@ -228,6 +228,8 @@ const PRInt32 nsCSSProps::kAppearanceKTable[] = {
eCSSKeyword_sliderthumbtick, NS_THEME_SLIDER_TICK,
eCSSKeyword_checkboxcontainer, NS_THEME_CHECKBOX_CONTAINER,
eCSSKeyword_radiocontainer, NS_THEME_RADIO_CONTAINER,
eCSSKeyword_checkboxlabel, NS_THEME_CHECKBOX_LABEL,
eCSSKeyword_radiolabel, NS_THEME_RADIO_LABEL,
eCSSKeyword_window, NS_THEME_WINDOW,
eCSSKeyword_dialog, NS_THEME_DIALOG,
eCSSKeyword_menubar, NS_THEME_MENUBAR,

88
themes/classic/global/unix/checkbox.css
Просмотреть файл

@ -1,40 +1,25 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
/*
* The contents of this file are subject to the Netscape Public
* License Version 1.1 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.mozilla.org/NPL/
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
* Software distributed under the License is distributed on an "AS
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* implied. See the License for the specific language governing
* rights and limitations under the License.
*
* The Original Code is Mozilla Communicator client code, released
* March 31, 1998.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998-1999
* the Initial Developer. All Rights Reserved.
* The Initial Developer of the Original Code is Netscape
* Communications Corporation. Portions created by Netscape are
* Copyright (C) 1998-1999 Netscape Communications Corporation. All
* Rights Reserved.
*
* Contributor(s):
* Brian Ryner <bryner@brianryner.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either of the GNU General Public License Version 2 or later (the "GPL"),
* or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
*/
/* ===== checkbox.css ===================================================
== Styles used by the XUL checkbox element.
@ -46,18 +31,36 @@
checkbox {
-moz-appearance: checkbox-container;
-moz-box-align: center;
margin: 2px 4px;
padding: 0px 2px;
border: 1px solid transparent;
border-left: 2px transparent;
border-right: 2px transparent;
}
/* With native theming on, the spacer-box paints the check mark and includes
the spacing to the right, so that oversized checkbox images can slop over
into the space.
If we need to disable checkbox theming, the spacer box no longer paints
the check mark, but its fallback CSS border supplies the padding between
the mark and the label. The xul:image then takes over painting the check
mark. */
.checkbox-spacer-box {
-moz-appearance: checkbox;
-moz-box-align: center;
border-right: 4px solid transparent;
}
.checkbox-label-center-box {
-moz-box-align: center;
}
.checkbox-label-box {
margin-left: 2px;
padding: 0px 1px;
border: 1px solid transparent;
-moz-appearance: checkbox-label;
}
.checkbox-icon {
.checkbox-icon[src] {
margin-right: 2px;
}
@ -67,13 +70,13 @@ checkbox {
/* ..... focused state ..... */
checkbox:focus {
border: 1px solid ThreeDDarkShadow;
checkbox:focus > .checkbox-label-center-box > .checkbox-label-box {
border: 1px dotted ThreeDDarkShadow;
}
/* ..... disabled state ..... */
checkbox[disabled="true"] > .checkbox-check {
checkbox[disabled="true"] > .checkbox-spacer-box > .checkbox-check {
background-color: -moz-Dialog;
}
@ -84,10 +87,7 @@ checkbox[disabled="true"] {
/* ::::: checkmark image ::::: */
.checkbox-check {
-moz-appearance: checkbox;
-moz-box-align: center;
border: 2px solid;
margin: 5px 0px 4px 0px;
-moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
-moz-border-right-colors: ThreeDHighlight ThreeDLightShadow;
-moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow;
@ -103,17 +103,17 @@ checkbox:hover {
}
#endif
checkbox:hover:active > .checkbox-check {
checkbox:hover:active > .checkbox-spacer-box > .checkbox-check {
background-color: -moz-Dialog;
}
/* ..... checked state ..... */
checkbox[checked="true"] > .checkbox-check {
checkbox[checked="true"] > .checkbox-spacer-box > .checkbox-check {
background-image: url("chrome://global/skin/checkbox/cbox-check.gif");
}
checkbox[checked="true"][disabled="true"] > .checkbox-check {
checkbox[checked="true"][disabled="true"] > .checkbox-spacer-box > .checkbox-check {
background-image: url("chrome://global/skin/checkbox/cbox-check-dis.gif") !important
}

167
themes/classic/global/unix/global.css Normal file
Просмотреть файл

@ -0,0 +1,167 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is Mozilla Communicator client code, released
* March 31, 1998.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998-1999
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the terms of
* either of the GNU General Public License Version 2 or later (the "GPL"),
* or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
/* ===== global.css =====================================================
== Styles that apply everywhere.
======================================================================= */
/* all localizable skin settings shall live here */
@import url("chrome://global/locale/intl.css");
@import url("chrome://global/skin/formatting.css");
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
/* ::::: XBL bindings ::::: */
checkbox {
-moz-binding: url("chrome://global/content/bindings/checkbox.xml#checkbox-with-spacing");
}
radio {
-moz-binding: url("chrome://global/skin/globalBindings.xml#radio-with-spacing");
}
menulist > menupopup,
.menulist-menupopup {
-moz-binding: url("chrome://global/content/bindings/popup.xml#popup-scrollbars");
}
.menulist-compact {
-moz-binding: url("chrome://global/content/bindings/menulist.xml#menulist-compact");
}
/* ::::: root elements ::::: */
window,
page,
dialog,
wizard {
-moz-appearance: window;
background-color: -moz-Dialog;
color: -moz-DialogText;
font: message-box;
}
/* deprecated */
window.dialog {
padding: 8px 10px 10px 8px;
}
[wait-cursor] {
cursor: wait !important;
}
/* ::::: alert icons :::::*/
.message-icon,
.alert-icon,
.error-icon,
.question-icon {
width: 32px;
height: 32px;
}
.message-icon {
list-style-image: url("chrome://global/skin/icons/alert-message.gif");
}
.alert-icon {
list-style-image: url("chrome://global/skin/icons/alert-exclam.gif");
}
.error-icon {
list-style-image: url("chrome://global/skin/icons/alert-error.gif");
}
.question-icon {
list-style-image: url("chrome://global/skin/icons/alert-question.gif");
}
/* ::::: iframe ::::: */
iframe {
border: none;
width: 100px;
height: 100px;
min-width: 10px;
min-height: 10px;
}
/* ::::: statusbar ::::: */
statusbar {
-moz-appearance: statusbar;
border-top: 1px solid ThreeDLightShadow;
border-left: 1px solid ThreeDShadow;
border-right: 1px solid ThreeDHighlight;
border-bottom: 1px solid ThreeDHighlight;
background-color: -moz-Dialog;
}
statusbarpanel {
-moz-appearance: statusbarpanel;
-moz-box-align: center;
-moz-box-pack: center;
border-left: 1px solid ThreeDHighlight;
border-top: 1px solid ThreeDHighlight;
border-right: 1px solid ThreeDShadow;
border-bottom: 1px solid ThreeDShadow;
padding: 0 4px;
}
.statusbar-resizerpanel {
-moz-box-align: end;
-moz-box-pack: end;
-moz-appearance: resizerpanel;
padding: 0px;
}
.statusbarpanel-iconic {
padding: 0px;
}
resizer[dir="bottomright"] {
-moz-appearance: resizer;
cursor: se-resize;
}
/* ::::: miscellaneous ::::: */
.toolbar-focustarget {
-moz-user-focus: ignore !important;
}

6
themes/classic/global/unix/jar.mn
Просмотреть файл

@ -1,6 +0,0 @@
classic.jar:
+ skin/classic/global/autocomplete.css
*+ skin/classic/global/checkbox.css
*+ skin/classic/global/radio.css
*+ skin/classic/global/button.css
*+ skin/classic/global/toolbarbutton.css

89
themes/classic/global/unix/radio.css
Просмотреть файл

@ -1,40 +1,25 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
/*
* The contents of this file are subject to the Netscape Public
* License Version 1.1 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.mozilla.org/NPL/
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
* Software distributed under the License is distributed on an "AS
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* implied. See the License for the specific language governing
* rights and limitations under the License.
*
* The Original Code is Mozilla Communicator client code, released
* March 31, 1998.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998-1999
* the Initial Developer. All Rights Reserved.
* The Initial Developer of the Original Code is Netscape
* Communications Corporation. Portions created by Netscape are
* Copyright (C) 1998-1999 Netscape Communications Corporation. All
* Rights Reserved.
*
* Contributor(s):
* Brian Ryner <bryner@brianryner.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either of the GNU General Public License Version 2 or later (the "GPL"),
* or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
*/
/* ===== radio.css ===================================================
== Styles used by the XUL radio element.
@ -46,18 +31,38 @@
radio {
-moz-appearance: radio-container;
-moz-box-align: center;
margin: 2px 4px;
padding: 0px 2px 0px 1px;
border: 1px solid transparent;
border-left: 2px transparent;
border-right: 2px transparent;
}
/* With native theming on, the spacer-box paints the radio mark and includes
the spacing to the right, so that oversized radio images can slop over
into the space.
If we need to disable radio button theming, the spacer box no longer paints
the radio mark, but its fallback CSS border supplies the padding between
the mark and the label. The xul:image then takes over painting the radio
mark. */
.radio-spacer-box {
-moz-appearance: radio;
-moz-box-align: center;
border-right: 4px solid transparent;
border-top: 1px;
border-bottom: 1px;
}
.radio-label-center-box {
-moz-box-align: center;
}
.radio-label-box {
margin-left: 2px;
padding: 0px 0px 1px 1px;
border: 1px solid transparent;
-moz-appearance: radio-label;
}
.radio-icon {
.radio-icon[src] {
margin-right: 2px;
}
@ -67,13 +72,13 @@ radio {
/* ..... focused state ..... */
radio[focused="true"] {
border: 1px solid ThreeDDarkShadow;
radio[focused="true"] > .radio-label-center-box > .radio-label-box {
border: 1px dotted ThreeDDarkShadow;
}
/* ..... disabled state ..... */
radio[disabled="true"] > .radio-check-box1 {
radio[disabled="true"] > .radio-spacer-box > .radio-check-box1 {
background-color: -moz-Dialog;
}
@ -84,8 +89,6 @@ radio[disabled="true"] {
/* ::::: checkmark image ::::: */
.radio-check-box1 {
-moz-appearance: radio;
margin: 3px 0px 4px 0px;
border-top: 1px solid ThreeDShadow;
border-right: 1px solid ThreeDHighlight;
border-bottom: 1px solid ThreeDHighlight;
@ -114,16 +117,16 @@ radio:hover {
}
#endif
radio:hover:active > .radio-check-box1 {
radio:hover:active > .radio-spacer-box > .radio-check-box1 {
background-color: -moz-Dialog;
}
/* ..... selected state ..... */
radio[selected="true"] > .radio-check-box1 > .radio-check-box2 {
radio[selected="true"] > .radio-spacer-box > .radio-check-box1 > .radio-check-box2 {
list-style-image: url("chrome://global/skin/radio/radio-check.gif");
}
radio[selected="true"][disabled="true"] > .radio-check-box1 {
radio[selected="true"][disabled="true"] > .radio-spacer-box > .radio-check-box1 > .radio-check-box2 {
list-style-image: url("chrome://global/skin/radio/radio-check-dis.gif") !important
}

20
themes/classic/global/win/globalBindings.xml
Просмотреть файл

@ -20,4 +20,24 @@
</content>
</binding>
<binding id="radio-with-spacing"
extends="chrome://global/skin/globalBindings.xml#radio">
<content>
<xul:hbox class="radio-spacer-box">
<xul:hbox class="radio-check-box1" xbl:inherits="selected,checked,disabled">
<xul:hbox class="radio-check-box2" flex="1">
<xul:image class="radio-check" xbl:inherits="selected,checked,disabled"/>
</xul:hbox>
</xul:hbox>
</xul:hbox>
<xul:hbox class="radio-label-center-box" flex="1">
<xul:hbox class="radio-label-box" flex="1">
<xul:image class="radio-icon" xbl:inherits="src"/>
<xul:label class="radio-label" xbl:inherits="xbl:text=label,accesskey,crop" flex="1"/>
</xul:hbox>
</xul:hbox>
</content>
</binding>
</bindings>

18
toolkit/content/widgets/checkbox.xml
Просмотреть файл

@ -67,4 +67,20 @@
</handlers>
</binding>
</bindings>
<binding id="checkbox-with-spacing"
extends="chrome://global/content/bindings/checkbox.xml#checkbox">
<content>
<xul:hbox class="checkbox-spacer-box">
<xul:image class="checkbox-check" xbl:inherits="checked,disabled"/>
</xul:hbox>
<xul:hbox class="checkbox-label-center-box" flex="1">
<xul:hbox class="checkbox-label-box" flex="1">
<xul:image class="checkbox-icon" xbl:inherits="src"/>
<xul:label class="checkbox-label" xbl:inherits="xbl:text=label,accesskey,crop" flex="1"/>
</xul:hbox>
</xul:hbox>
</content>
</binding>
</bindings>

1
toolkit/content/widgets/radio.xml
Просмотреть файл

@ -418,4 +418,5 @@
</handler>
</handlers>
</binding>
</bindings>

117
toolkit/themes/gnomestripe/global/checkbox.css Normal file
Просмотреть файл

@ -0,0 +1,117 @@
/*
* The contents of this file are subject to the Netscape Public
* License Version 1.1 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.mozilla.org/NPL/
*
* Software distributed under the License is distributed on an "AS
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* implied. See the License for the specific language governing
* rights and limitations under the License.
*
* The Original Code is Mozilla Communicator client code, released
* March 31, 1998.
*
* The Initial Developer of the Original Code is Netscape
* Communications Corporation. Portions created by Netscape are
* Copyright (C) 1998-1999 Netscape Communications Corporation. All
* Rights Reserved.
*
* Contributor(s):
*
*/
/* ===== checkbox.css ===================================================
== Styles used by the XUL checkbox element.
======================================================================= */
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
/* ::::: checkbox ::::: */
checkbox {
-moz-appearance: checkbox-container;
margin: 2px 4px;
border-left: 2px transparent;
border-right: 2px transparent;
}
/* With native theming on, the spacer-box paints the check mark and includes
the spacing to the right, so that oversized checkbox images can slop over
into the space.
If we need to disable checkbox theming, the spacer box no longer paints
the check mark, but its fallback CSS border supplies the padding between
the mark and the label. The xul:image then takes over painting the check
mark. */
.checkbox-spacer-box {
-moz-appearance: checkbox;
-moz-box-align: center;
border-right: 4px solid transparent;
}
.checkbox-label-center-box {
-moz-box-align: center;
}
.checkbox-label-box {
border: 1px solid transparent;
-moz-appearance: checkbox-label;
}
.checkbox-icon[src] {
margin-right: 2px;
}
.checkbox-label {
margin: 0 !important;
}
/* ..... focused state ..... */
checkbox:focus > .checkbox-label-center-box > .checkbox-label-box {
border: 1px dotted ThreeDDarkShadow;
}
/* ..... disabled state ..... */
checkbox[disabled="true"] > .checkbox-spacer-box > .checkbox-check {
background-color: -moz-Dialog;
}
checkbox[disabled="true"] {
color: GrayText !important;
}
/* ::::: checkmark image ::::: */
.checkbox-check {
border: 2px solid;
-moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
-moz-border-right-colors: ThreeDHighlight ThreeDLightShadow;
-moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow;
-moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
min-width: 13px;
min-height: 13px;
background: -moz-Field no-repeat 50% 50%;
}
checkbox:hover {
color: -moz-gtk2-hovertext;
}
checkbox:hover:active > .checkbox-spacer-box > .checkbox-check {
background-color: -moz-Dialog;
}
/* ..... checked state ..... */
checkbox[checked="true"] > .checkbox-spacer-box > .checkbox-check {
background-image: url("chrome://global/skin/checkbox/cbox-check.gif");
}
checkbox[checked="true"][disabled="true"] > .checkbox-spacer-box > .checkbox-check {
background-image: url("chrome://global/skin/checkbox/cbox-check-dis.gif") !important
}

169
toolkit/themes/gnomestripe/global/global.css Normal file
Просмотреть файл

@ -0,0 +1,169 @@
/*
* The contents of this file are subject to the Netscape Public
* License Version 1.1 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.mozilla.org/NPL/
*
* Software distributed under the License is distributed on an "AS
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* implied. See the License for the specific language governing
* rights and limitations under the License.
*
* The Original Code is Mozilla Communicator client code, released
* March 31, 1998.
*
* The Initial Developer of the Original Code is Netscape
* Communications Corporation. Portions created by Netscape are
* Copyright (C) 1998-1999 Netscape Communications Corporation. All
* Rights Reserved.
*
* Contributor(s):
*
*/
/* ===== global.css =====================================================
== Styles that apply everywhere.
======================================================================= */
/* all localizable skin settings shall live here */
@import url("chrome://global/locale/intl.css");
@import url("chrome://global/skin/formatting.css");
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
/* ::::: XBL bindings ::::: */
checkbox {
-moz-binding: url("chrome://global/content/bindings/checkbox.xml#checkbox-with-spacing");
}
radio {
-moz-binding: url("chrome://global/skin/globalBindings.xml#radio-with-spacing");
}
menulist > menupopup,
.menulist-menupopup {
-moz-binding: url("chrome://global/content/bindings/popup.xml#popup-scrollbars");
}
.menulist-compact {
-moz-binding: url("chrome://global/content/bindings/menulist.xml#menulist-compact");
}
/* ::::: root elements ::::: */
window,
page,
dialog,
wizard {
-moz-appearance: window;
background-color: -moz-Dialog;
color: -moz-DialogText;
font: message-box;
}
/* deprecated */
window.dialog {
padding: 8px 10px 10px 8px;
}
[wait-cursor] {
cursor: wait !important;
}
/* ::::: alert icons :::::*/
.message-icon,
.alert-icon,
.error-icon,
.question-icon {
width: 32px;
height: 32px;
}
.message-icon {
list-style-image: url("chrome://global/skin/icons/Message.png");
}
.alert-icon {
list-style-image: url("chrome://global/skin/icons/Warning.png");
}
.error-icon {
list-style-image: url("chrome://global/skin/icons/Error.png");
}
.question-icon {
list-style-image: url("chrome://global/skin/icons/Question.png");
}
/* ::::: iframe ::::: */
iframe {
border: none;
width: 100px;
height: 100px;
min-width: 10px;
min-height: 10px;
}
/* ::::: statusbar ::::: */
statusbar {
-moz-appearance: statusbar;
border-top: 1px solid ThreeDLightShadow;
border-left: 1px solid ThreeDShadow;
border-right: 1px solid ThreeDHighlight;
border-bottom: 1px solid ThreeDHighlight;
background-color: -moz-Dialog;
min-height: 22px;
}
statusbarpanel {
-moz-appearance: statusbarpanel;
-moz-box-align: center;
-moz-box-pack: center;
border-left: 1px solid ThreeDHighlight;
border-top: 1px solid ThreeDHighlight;
border-right: 1px solid ThreeDShadow;
border-bottom: 1px solid ThreeDShadow;
padding: 0 4px;
}
.statusbar-resizerpanel {
-moz-box-align: end;
-moz-box-pack: end;
-moz-appearance: resizerpanel;
padding: 0px;
border: none;
}
.statusbarpanel-iconic {
padding: 0px;
}
resizer[dir="bottomright"] {
-moz-appearance: resizer;
cursor: se-resize;
}
/* XXXBlake yeah, shoot me -- these don't belong here. I'll move them later. */
sidebarheader {
-moz-appearance: toolbox;
height: 25px;
background-color: -moz-Dialog;
border-bottom: 1px solid ThreeDShadow;
border-top: 1px solid ThreeDHighlight;
}
sidebarheader > label {
padding-left: 4px;
}
/* ::::: miscellaneous ::::: */
.toolbar-focustarget {
-moz-user-focus: ignore !important;
}

3
toolkit/themes/gnomestripe/global/jar.mn
Просмотреть файл

@ -3,3 +3,6 @@ classic.jar:
+ skin/classic/global/popup.css
+ skin/classic/global/menu.css
+ skin/classic/global/toolbar.css
+ skin/classic/global/checkbox.css
+ skin/classic/global/radio.css
+ skin/classic/global/global.css

130
toolkit/themes/gnomestripe/global/radio.css Normal file
Просмотреть файл

@ -0,0 +1,130 @@
/*
* The contents of this file are subject to the Netscape Public
* License Version 1.1 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.mozilla.org/NPL/
*
* Software distributed under the License is distributed on an "AS
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* implied. See the License for the specific language governing
* rights and limitations under the License.
*
* The Original Code is Mozilla Communicator client code, released
* March 31, 1998.
*
* The Initial Developer of the Original Code is Netscape
* Communications Corporation. Portions created by Netscape are
* Copyright (C) 1998-1999 Netscape Communications Corporation. All
* Rights Reserved.
*
* Contributor(s):
*
*/
/* ===== radio.css ===================================================
== Styles used by the XUL radio element.
======================================================================= */
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
/* ::::: radio ::::: */
radio {
-moz-appearance: radio-container;
margin: 2px 4px;
border-left: 2px transparent;
border-right: 2px transparent;
}
/* With native theming on, the spacer-box paints the radio mark and includes
the spacing to the right, so that oversized radio images can slop over
into the space.
If we need to disable radio button theming, the spacer box no longer paints
the radio mark, but its fallback CSS border supplies the padding between
the mark and the label. The xul:image then takes over painting the radio
mark. */
.radio-spacer-box {
-moz-appearance: radio;
-moz-box-align: center;
border-right: 4px solid transparent;
border-top: 1px;
border-bottom: 1px;
}
.radio-label-center-box {
-moz-box-align: center;
}
.radio-label-box {
border: 1px solid transparent;
-moz-appearance: radio-label;
}
.radio-icon[src] {
margin-right: 2px;
}
.radio-label {
margin: 0 !important;
}
/* ..... focused state ..... */
radio[focused="true"] > .radio-label-center-box > .radio-label-box {
border: 1px dotted ThreeDDarkShadow;
}
/* ..... disabled state ..... */
radio[disabled="true"] > .radio-spacer-box > .radio-check-box1 {
background-color: -moz-Dialog;
}
radio[disabled="true"] {
color: GrayText !important;
}
/* ::::: checkmark image ::::: */
.radio-check-box1 {
border-top: 1px solid ThreeDShadow;
border-right: 1px solid ThreeDHighlight;
border-bottom: 1px solid ThreeDHighlight;
border-left: 1px solid ThreeDShadow;
-moz-border-radius: 50%;
min-width: 12px;
min-height: 12px;
background-color: -moz-Field;
}
.radio-check-box2 {
border-top: 1px solid ThreeDDarkShadow;
border-right: 1px solid ThreeDLightShadow;
border-bottom: 1px solid ThreeDLightShadow;
border-left: 1px solid ThreeDDarkShadow;
-moz-border-radius: 50%;
padding: 2px;
width: 4px;
height: 4px;
list-style-image: none;
}
radio:hover {
color: -moz-gtk2-hovertext;
}
radio:hover:active > .radio-spacer-box > .radio-check-box1 {
background-color: -moz-Dialog;
}
/* ..... selected state ..... */
radio[selected="true"] > .radio-spacer-box > .radio-check-box1 > .radio-check-box2 {
list-style-image: url("chrome://global/skin/radio/radio-check.gif");
}
radio[selected="true"][disabled="true"] > .radio-spacer-box > .radio-check-box1 > .radio-check-box2 {
list-style-image: url("chrome://global/skin/radio/radio-check-dis.gif") !important
}

22
toolkit/themes/winstripe/global/globalBindings.xml
Просмотреть файл

@ -20,6 +20,26 @@
</content>
</binding>
<binding id="radio-with-spacing"
extends="chrome://global/skin/globalBindings.xml#radio">
<content>
<xul:hbox class="radio-spacer-box">
<xul:hbox class="radio-check-box1" xbl:inherits="selected,checked,disabled">
<xul:hbox class="radio-check-box2" flex="1">
<xul:image class="radio-check" xbl:inherits="selected,checked,disabled"/>
</xul:hbox>
</xul:hbox>
</xul:hbox>
<xul:hbox class="radio-label-center-box" flex="1">
<xul:hbox class="radio-label-box" flex="1">
<xul:image class="radio-icon" xbl:inherits="src"/>
<xul:label class="radio-label" xbl:inherits="xbl:text=label,accesskey,crop" flex="1"/>
</xul:hbox>
</xul:hbox>
</content>
</binding>
<binding id="toolbarpaletteitem-spacer" extends="chrome://global/content/bindings/toolbar.xml#toolbarpaletteitem">
<content>
<xul:spacer class="spacer-left"/>
@ -28,4 +48,4 @@
</content>
</binding>
</bindings>
</bindings>

18
xpfe/global/resources/content/bindings/checkbox.xml
Просмотреть файл

@ -67,4 +67,20 @@
</handlers>
</binding>
</bindings>
<binding id="checkbox-with-spacing"
extends="chrome://global/content/bindings/checkbox.xml#checkbox">
<content>
<xul:hbox class="checkbox-spacer-box">
<xul:image class="checkbox-check" xbl:inherits="checked,disabled"/>
</xul:hbox>
<xul:hbox class="checkbox-label-center-box" flex="1">
<xul:hbox class="checkbox-label-box" flex="1">
<xul:image class="checkbox-icon" xbl:inherits="src"/>
<xul:label class="checkbox-label" xbl:inherits="xbl:text=label,accesskey,crop" flex="1"/>
</xul:hbox>
</xul:hbox>
</content>
</binding>
</bindings>