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

Bug 501104. Handle GTK2 default button borders properly. r+sr=roc

This commit is contained in:
Michael Ventnor 2009-07-04 22:01:16 +12:00
Родитель 48c24f1c0a
Коммит dc56dfb0f3
3 изменённых файлов: 142 добавлений и 102 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

213
widget/src/gtk2/gtk2drawing.c
Просмотреть файл

@ -784,93 +784,6 @@ TSOffsetStyleGCs(GtkStyle* style, gint xorigin, gint yorigin)
return MOZ_GTK_SUCCESS;
}
static gint
moz_gtk_button_paint(GdkDrawable* drawable, GdkRectangle* rect,
GdkRectangle* cliprect, GtkWidgetState* state,
GtkReliefStyle relief, GtkWidget* widget,
GtkTextDirection direction)
{
GtkShadowType shadow_type;
GtkStyle* style = widget->style;
GtkStateType button_state = ConvertGtkState(state);
gint x = rect->x, y=rect->y, width=rect->width, height=rect->height;
gboolean interior_focus;
gint focus_width, focus_pad;
moz_gtk_widget_get_focus(widget, &interior_focus, &focus_width, &focus_pad);
if (WINDOW_IS_MAPPED(drawable)) {
gdk_window_set_back_pixmap(drawable, NULL, TRUE);
gdk_window_clear_area(drawable, cliprect->x, cliprect->y,
cliprect->width, cliprect->height);
}
gtk_widget_set_state(widget, button_state);
gtk_widget_set_direction(widget, direction);
if (state->isDefault)
GTK_WIDGET_SET_FLAGS(widget, GTK_HAS_DEFAULT);
GTK_BUTTON(widget)->relief = relief;
/* Some theme engines love to cause us pain in that gtk_paint_focus is a
no-op on buttons and button-like widgets. They only listen to this flag. */
if (state->focused && !state->disabled)
GTK_WIDGET_SET_FLAGS(widget, GTK_HAS_FOCUS);
if (!interior_focus && state->focused) {
x += focus_width + focus_pad;
y += focus_width + focus_pad;
width -= 2 * (focus_width + focus_pad);
height -= 2 * (focus_width + focus_pad);
}
shadow_type = button_state == GTK_STATE_ACTIVE ||
state->depressed ? GTK_SHADOW_IN : GTK_SHADOW_OUT;
if (state->isDefault && relief == GTK_RELIEF_NORMAL) {
gint default_top, default_left, default_bottom, default_right;
moz_gtk_button_get_default_border(&default_top, &default_left,
&default_bottom, &default_right);
gtk_paint_box(style, drawable, GTK_STATE_NORMAL, GTK_SHADOW_IN, cliprect,
widget, "buttondefault", x - default_left, y - default_top,
width + default_left + default_right, height + default_top + default_bottom);
}
if (relief != GTK_RELIEF_NONE || state->depressed ||
button_state == GTK_STATE_PRELIGHT) {
TSOffsetStyleGCs(style, x, y);
/* the following line can trigger an assertion (Crux theme)
file ../../gdk/gdkwindow.c: line 1846 (gdk_window_clear_area):
assertion `GDK_IS_WINDOW (window)' failed */
gtk_paint_box(style, drawable, button_state, shadow_type, cliprect,
widget, "button", x, y, width, height);
}
if (state->focused) {
if (interior_focus) {
x += widget->style->xthickness + focus_pad;
y += widget->style->ythickness + focus_pad;
width -= 2 * (widget->style->xthickness + focus_pad);
height -= 2 * (widget->style->ythickness + focus_pad);
} else {
x -= focus_width + focus_pad;
y -= focus_width + focus_pad;
width += 2 * (focus_width + focus_pad);
height += 2 * (focus_width + focus_pad);
}
TSOffsetStyleGCs(style, x, y);
gtk_paint_focus(style, drawable, button_state, cliprect,
widget, "button", x, y, width, height);
}
GTK_WIDGET_UNSET_FLAGS(widget, GTK_HAS_DEFAULT);
GTK_WIDGET_UNSET_FLAGS(widget, GTK_HAS_FOCUS);
return MOZ_GTK_SUCCESS;
}
gint
moz_gtk_init()
{
@ -934,8 +847,8 @@ moz_gtk_widget_get_focus(GtkWidget* widget, gboolean* interior_focus,
}
gint
moz_gtk_button_get_default_border(gint* border_top, gint* border_left,
gint* border_bottom, gint* border_right)
moz_gtk_button_get_default_overflow(gint* border_top, gint* border_left,
gint* border_bottom, gint* border_right)
{
ensure_button_widget();
@ -956,6 +869,30 @@ moz_gtk_button_get_default_border(gint* border_top, gint* border_left,
return MOZ_GTK_SUCCESS;
}
static gint
moz_gtk_button_get_default_border(gint* border_top, gint* border_left,
gint* border_bottom, gint* border_right)
{
ensure_button_widget();
GtkBorder* default_border;
gtk_widget_style_get(gButtonWidget,
"default-border", &default_border,
NULL);
if (default_border) {
*border_top = default_border->top;
*border_left = default_border->left;
*border_bottom = default_border->bottom;
*border_right = default_border->right;
gtk_border_free(default_border);
} else {
/* see gtkbutton.c */
*border_top = *border_left = *border_bottom = *border_right = 1;
}
return MOZ_GTK_SUCCESS;
}
gint
moz_gtk_splitter_get_metrics(gint orientation, gint* size)
{
@ -987,6 +924,104 @@ moz_gtk_button_get_inner_border(GtkWidget* widget, GtkBorder* inner_border)
return MOZ_GTK_SUCCESS;
}
static gint
moz_gtk_button_paint(GdkDrawable* drawable, GdkRectangle* rect,
GdkRectangle* cliprect, GtkWidgetState* state,
GtkReliefStyle relief, GtkWidget* widget,
GtkTextDirection direction)
{
GtkShadowType shadow_type;
GtkStyle* style = widget->style;
GtkStateType button_state = ConvertGtkState(state);
gint x = rect->x, y=rect->y, width=rect->width, height=rect->height;
gboolean interior_focus;
gint focus_width, focus_pad;
moz_gtk_widget_get_focus(widget, &interior_focus, &focus_width, &focus_pad);
if (WINDOW_IS_MAPPED(drawable)) {
gdk_window_set_back_pixmap(drawable, NULL, TRUE);
gdk_window_clear_area(drawable, cliprect->x, cliprect->y,
cliprect->width, cliprect->height);
}
gtk_widget_set_state(widget, button_state);
gtk_widget_set_direction(widget, direction);
if (state->isDefault)
GTK_WIDGET_SET_FLAGS(widget, GTK_HAS_DEFAULT);
GTK_BUTTON(widget)->relief = relief;
/* Some theme engines love to cause us pain in that gtk_paint_focus is a
no-op on buttons and button-like widgets. They only listen to this flag. */
if (state->focused && !state->disabled)
GTK_WIDGET_SET_FLAGS(widget, GTK_HAS_FOCUS);
if (!interior_focus && state->focused) {
x += focus_width + focus_pad;
y += focus_width + focus_pad;
width -= 2 * (focus_width + focus_pad);
height -= 2 * (focus_width + focus_pad);
}
shadow_type = button_state == GTK_STATE_ACTIVE ||
state->depressed ? GTK_SHADOW_IN : GTK_SHADOW_OUT;
if (state->isDefault && relief == GTK_RELIEF_NORMAL) {
/* handle default borders both outside and inside the button */
gint default_top, default_left, default_bottom, default_right;
moz_gtk_button_get_default_overflow(&default_top, &default_left,
&default_bottom, &default_right);
x -= default_left;
y -= default_top;
width += default_left + default_right;
height += default_top + default_bottom;
gtk_paint_box(style, drawable, GTK_STATE_NORMAL, GTK_SHADOW_IN, cliprect,
widget, "buttondefault", x, y, width, height);
moz_gtk_button_get_default_border(&default_top, &default_left,
&default_bottom, &default_right);
x += default_left;
y += default_top;
width -= (default_left + default_right);
height -= (default_top + default_bottom);
}
if (relief != GTK_RELIEF_NONE || state->depressed ||
button_state == GTK_STATE_PRELIGHT) {
TSOffsetStyleGCs(style, x, y);
/* the following line can trigger an assertion (Crux theme)
file ../../gdk/gdkwindow.c: line 1846 (gdk_window_clear_area):
assertion `GDK_IS_WINDOW (window)' failed */
gtk_paint_box(style, drawable, button_state, shadow_type, cliprect,
widget, "button", x, y, width, height);
}
if (state->focused) {
if (interior_focus) {
x += widget->style->xthickness + focus_pad;
y += widget->style->ythickness + focus_pad;
width -= 2 * (widget->style->xthickness + focus_pad);
height -= 2 * (widget->style->ythickness + focus_pad);
} else {
x -= focus_width + focus_pad;
y -= focus_width + focus_pad;
width += 2 * (focus_width + focus_pad);
height += 2 * (focus_width + focus_pad);
}
TSOffsetStyleGCs(style, x, y);
gtk_paint_focus(style, drawable, button_state, cliprect,
widget, "button", x, y, width, height);
}
GTK_WIDGET_UNSET_FLAGS(widget, GTK_HAS_DEFAULT);
GTK_WIDGET_UNSET_FLAGS(widget, GTK_HAS_FOCUS);
return MOZ_GTK_SUCCESS;
}
static gint
moz_gtk_toggle_paint(GdkDrawable* drawable, GdkRectangle* rect,
GdkRectangle* cliprect, GtkWidgetState* state,

4
widget/src/gtk2/gtkdrawing.h
Просмотреть файл

@ -332,8 +332,8 @@ moz_gtk_widget_get_focus(GtkWidget* widget, gboolean* interior_focus,
* returns: MOZ_GTK_SUCCESS if there was no error, an error code otherwise
*/
gint
moz_gtk_button_get_default_border(gint* border_top, gint* border_left,
gint* border_bottom, gint* border_right);
moz_gtk_button_get_default_overflow(gint* border_top, gint* border_left,
gint* border_bottom, gint* border_right);
/**
* Get the desired size of a GtkScale thumb

27
widget/src/gtk2/nsNativeThemeGTK.cpp
Просмотреть файл

@ -655,7 +655,8 @@ ThemeRenderer::NativeDraw(GdkDrawable * drawable, short offsetX,
}
static PRBool
GetExtraSizeForWidget(PRUint8 aWidgetType, nsIntMargin* aExtra)
GetExtraSizeForWidget(PRUint8 aWidgetType, PRBool aWidgetIsDefault,
nsIntMargin* aExtra)
{
*aExtra = nsIntMargin(0,0,0,0);
// Allow an extra one pixel above and below the thumb for certain
@ -689,13 +690,17 @@ GetExtraSizeForWidget(PRUint8 aWidgetType, nsIntMargin* aExtra)
}
case NS_THEME_BUTTON :
{
gint top, left, bottom, right;
moz_gtk_button_get_default_border(&top, &left, &bottom, &right);
aExtra->top = top;
aExtra->right = right;
aExtra->bottom = bottom;
aExtra->left = left;
return PR_TRUE;
if (aWidgetIsDefault) {
// Some themes draw a default indicator outside the widget,
// include that in overflow
gint top, left, bottom, right;
moz_gtk_button_get_default_overflow(&top, &left, &bottom, &right);
aExtra->top = top;
aExtra->right = right;
aExtra->bottom = bottom;
aExtra->left = left;
return PR_TRUE;
}
}
default:
return PR_FALSE;
@ -755,13 +760,13 @@ nsNativeThemeGTK::DrawWidgetBackground(nsIRenderingContext* aContext,
// The margin should be applied to the widget rect rather than the dirty
// rect but nsCSSRendering::PaintBackgroundWithSC has already intersected
// the dirty rect with the uninflated widget rect.
if (GetExtraSizeForWidget(aWidgetType, &extraSize)) {
if (GetExtraSizeForWidget(aWidgetType, state.isDefault, &extraSize)) {
drawingRect.Inflate(extraSize);
}
// gdk rectangles are wrt the drawing rect.
// The gdk_clip is just advisory here, meanining "you don't
// The gdk_clip is just advisory here, meaning "you don't
// need to draw outside this rect if you don't feel like it!"
GdkRectangle gdk_clip = {0, 0, drawingRect.width, drawingRect.height};
@ -920,7 +925,7 @@ nsNativeThemeGTK::GetWidgetOverflow(nsIDeviceContext* aContext,
}
} else {
nsIntMargin extraSize;
if (!GetExtraSizeForWidget(aWidgetType, &extraSize))
if (!GetExtraSizeForWidget(aWidgetType, IsDefaultButton(aFrame), &extraSize))
return PR_FALSE;
p2a = aContext->AppUnitsPerDevPixel();