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

Bug 329846, enable native theme in HTML content on Linux, Patch by Michael Ventnor, r+sr=roc

Browse Source
This commit is contained in:
flamingice@sourmilk.net 2007-06-04 20:26:43 -07:00
parent 569cd785c8
commit 86259690a0
3 changed files with 76 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
widget/src/gtk2/gtk2drawing.c
View File

@ -22,6 +22,7 @@
* Contributor(s):
* Brian Ryner <bryner@brianryner.com> (Original Author)
* Pierre Chanial <p_ch@verizon.net>
* Michael Ventnor <m.ventnor@gmail.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
@ -598,6 +599,9 @@ moz_gtk_toggle_paint(GdkDrawable* drawable, GdkRectangle* rect,
GtkWidget *w;
GtkStyle *style;
if (state->focused && state_type == GTK_STATE_NORMAL)
state_type = GTK_STATE_PRELIGHT;
if (isradio) {
moz_gtk_radio_get_metrics(&indicator_size, &indicator_spacing);
w = gRadiobuttonWidget;
@ -967,6 +971,9 @@ moz_gtk_entry_paint(GdkDrawable* drawable, GdkRectangle* rect,
x = XTHICKNESS(style);
y = YTHICKNESS(style);
/* This gets us a lovely greyish disabledish look */
gtk_widget_set_sensitive(gEntryWidget, !state->disabled);
TSOffsetStyleGCs(style, rect->x + x, rect->y + y);
gtk_paint_flat_box(style, drawable, GTK_STATE_NORMAL, GTK_SHADOW_NONE,
cliprect, gEntryWidget, "entry_bg", rect->x + x,
@ -1066,13 +1073,10 @@ moz_gtk_option_menu_paint(GdkDrawable* drawable, GdkRectangle* rect,
if (interior_focus) {
x += XTHICKNESS(style) + focus_pad;
y += YTHICKNESS(style) + focus_pad;
width -= 2 * (XTHICKNESS(style) + focus_pad) +
indicator_spacing.left + indicator_spacing.right +
indicator_size.width;
/* Standard GTK combos have their focus ring around the entire
control, not just the text bit */
width -= 2 * (XTHICKNESS(style) + focus_pad);
height -= 2 * (YTHICKNESS(style) + focus_pad);
if (gtk_widget_get_direction(gOptionMenuWidget) == GTK_TEXT_DIR_RTL)
x += indicator_spacing.left + indicator_spacing.right +
indicator_size.width;
} else {
x -= focus_width + focus_pad;
y -= focus_width + focus_pad;
@ -1529,8 +1533,8 @@ moz_gtk_window_paint(GdkDrawable* drawable, GdkRectangle* rect,
}
gint
moz_gtk_get_widget_border(GtkThemeWidgetType widget, gint* xthickness,
gint* ythickness)
moz_gtk_get_widget_border(GtkThemeWidgetType widget, gint* left, gint* top,
gint* right, gint* bottom, gboolean inhtml)
{
GtkWidget* w;
@ -1543,16 +1547,22 @@ moz_gtk_get_widget_border(GtkThemeWidgetType widget, gint* xthickness,
gint focus_width, focus_pad;
ensure_button_widget();
*left = *top = *right = *bottom = GTK_CONTAINER(gButtonWidget)->border_width;
moz_gtk_button_get_focus(&interior_focus,
&focus_width, &focus_pad);
/* Don't add this padding in HTML, otherwise the buttons will
become too big and stuff the layout. */
if (!inhtml) {
moz_gtk_button_get_focus(&interior_focus, &focus_width, &focus_pad);
*left += focus_width + focus_pad + child_spacing;
*right += focus_width + focus_pad + child_spacing;
*top += focus_width + focus_pad + child_spacing;
*bottom += focus_width + focus_pad + child_spacing;
}
*xthickness = *ythickness =
GTK_CONTAINER(gButtonWidget)->border_width + child_spacing
+ focus_width + focus_pad;
*xthickness += gButtonWidget->style->xthickness;
*ythickness += gButtonWidget->style->ythickness;
*left += gButtonWidget->style->xthickness;
*right += gButtonWidget->style->xthickness;
*top += gButtonWidget->style->ythickness;
*bottom += gButtonWidget->style->ythickness;
return MOZ_GTK_SUCCESS;
}
@ -1569,9 +1579,26 @@ moz_gtk_get_widget_border(GtkThemeWidgetType widget, gint* xthickness,
w = gDropdownButtonWidget;
break;
case MOZ_GTK_DROPDOWN:
{
/* We need to account for the arrow on the dropdown, so text doesn't
come too close to the arrow, or in some cases spill into the arrow. */
gboolean interior_focus;
GtkRequisition indicator_size;
GtkBorder indicator_spacing;
gint focus_width, focus_pad;
ensure_option_menu_widget();
w = gOptionMenuWidget;
break;
*right = *left = gOptionMenuWidget->style->xthickness;
*bottom = *top = gOptionMenuWidget->style->ythickness;
moz_gtk_option_menu_get_metrics(&interior_focus, &indicator_size,
&indicator_spacing, &focus_width, &focus_pad);
if (gtk_widget_get_direction(gOptionMenuWidget) == GTK_TEXT_DIR_RTL)
*left += indicator_spacing.left + indicator_size.width + indicator_spacing.right;
else
*right += indicator_spacing.left + indicator_size.width + indicator_spacing.right;
return MOZ_GTK_SUCCESS;
}
case MOZ_GTK_TABPANELS:
ensure_tab_widget();
w = gTabWidget;
@ -1613,9 +1640,9 @@ moz_gtk_get_widget_border(GtkThemeWidgetType widget, gint* xthickness,
&focus_width, &focus_pad);
if (interior_focus)
*xthickness = *ythickness = (focus_width + focus_pad);
*left = *top = *right = *bottom = (focus_width + focus_pad);
else
*xthickness = *ythickness = 0;
*left = *top = *right = *bottom = 0;
return MOZ_GTK_SUCCESS;
}
@ -1638,11 +1665,13 @@ moz_gtk_get_widget_border(GtkThemeWidgetType widget, gint* xthickness,
w = gRadiobuttonWidget;
}
*xthickness = *ythickness = GTK_CONTAINER(w)->border_width;
*left = *top = *right = *bottom = GTK_CONTAINER(w)->border_width;
if (!interior_focus) {
*xthickness += (focus_width + focus_pad);
*ythickness += (focus_width + focus_pad);
*left += (focus_width + focus_pad);
*right += (focus_width + focus_pad);
*top += (focus_width + focus_pad);
*bottom += (focus_width + focus_pad);
}
return MOZ_GTK_SUCCESS;
@ -1680,15 +1709,15 @@ moz_gtk_get_widget_border(GtkThemeWidgetType widget, gint* xthickness,
/* These widgets have no borders.*/
case MOZ_GTK_TOOLTIP:
case MOZ_GTK_WINDOW:
*xthickness = *ythickness = 0;
*left = *top = *right = *bottom = 0;
return MOZ_GTK_SUCCESS;
default:
g_warning("Unsupported widget type: %d", widget);
return MOZ_GTK_UNKNOWN_WIDGET;
}
*xthickness = XTHICKNESS(w->style);
*ythickness = YTHICKNESS(w->style);
*right = *left = XTHICKNESS(w->style);
*bottom = *top = YTHICKNESS(w->style);
return MOZ_GTK_SUCCESS;
}

10
widget/src/gtk2/gtkdrawing.h
View File

@ -209,13 +209,15 @@ moz_gtk_widget_paint(GtkThemeWidgetType widget, GdkDrawable* drawable,
/*** Widget metrics ***/
/**
* Get the border size of a widget
* xthickness: [OUT] the widget's left/right border
* ythickness: [OUT] the widget's top/bottom border
* left/right: [OUT] the widget's left/right border
* top/bottom: [OUT] the widget's top/bottom border
* inhtml: boolean indicating whether this widget will be drawn as a HTML form control,
* in order to workaround a size issue (MOZ_GTK_BUTTON only, ignored otherwise)
*
* returns: MOZ_GTK_SUCCESS if there was no error, an error code otherwise
*/
gint moz_gtk_get_widget_border(GtkThemeWidgetType widget, gint* xthickness,
gint* ythickness);
gint moz_gtk_get_widget_border(GtkThemeWidgetType widget, gint* left, gint* top,
gint* right, gint* bottom, gboolean inhtml);
/**
* Get the desired size of a GtkCheckButton

30
widget/src/gtk2/nsNativeThemeGTK.cpp
View File

@ -21,6 +21,7 @@
*
* Contributor(s):
* Brian Ryner <bryner@brianryner.com> (Original Author)
* Michael Ventnor <m.ventnor@gmail.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
@ -222,7 +223,7 @@ nsNativeThemeGTK::GetGtkWidgetAndState(PRUint8 aWidgetType, nsIFrame* aFrame,
PRInt32 eventState = GetContentState(stateFrame, aWidgetType);
aState->disabled = IsDisabled(aFrame);
aState->disabled = (IsDisabled(aFrame) || IsReadOnly(aFrame));
aState->active = (eventState & NS_EVENT_STATE_ACTIVE) == NS_EVENT_STATE_ACTIVE;
aState->focused = (eventState & NS_EVENT_STATE_FOCUS) == NS_EVENT_STATE_FOCUS;
aState->inHover = (eventState & NS_EVENT_STATE_HOVER) == NS_EVENT_STATE_HOVER;
@ -709,14 +710,14 @@ NS_IMETHODIMP
nsNativeThemeGTK::GetWidgetBorder(nsIDeviceContext* aContext, nsIFrame* aFrame,
PRUint8 aWidgetType, nsMargin* aResult)
{
aResult->top = aResult->left = 0;
aResult->top = aResult->left = aResult->right = aResult->bottom = 0;
switch (aWidgetType) {
case NS_THEME_SCROLLBAR_TRACK_VERTICAL:
case NS_THEME_SCROLLBAR_TRACK_HORIZONTAL:
{
MozGtkScrollbarMetrics metrics;
moz_gtk_get_scrollbar_metrics(&metrics);
aResult->top = aResult->left = metrics.trough_border;
aResult->top = aResult->left = aResult->right = aResult->bottom = metrics.trough_border;
}
break;
case NS_THEME_TOOLBOX:
@ -737,14 +738,11 @@ nsNativeThemeGTK::GetWidgetBorder(nsIDeviceContext* aContext, nsIFrame* aFrame,
GtkThemeWidgetType gtkWidgetType;
if (GetGtkWidgetAndState(aWidgetType, aFrame, gtkWidgetType, nsnull,
nsnull))
moz_gtk_get_widget_border(gtkWidgetType, &aResult->left,
&aResult->top);
moz_gtk_get_widget_border(gtkWidgetType, &aResult->left, &aResult->top,
&aResult->right, &aResult->bottom,
(aFrame ? aFrame->GetContent()->IsNodeOfType(nsINode::eHTML) : FALSE));
}
}
aResult->right = aResult->left;
aResult->bottom = aResult->top;
return NS_OK;
}
@ -941,6 +939,7 @@ nsNativeThemeGTK::WidgetStateChanged(nsIFrame* aFrame, PRUint8 aWidgetType,
aAttribute == nsWidgetAtoms::checked ||
aAttribute == nsWidgetAtoms::selected ||
aAttribute == nsWidgetAtoms::focused ||
aAttribute == nsWidgetAtoms::readonly ||
aAttribute == nsWidgetAtoms::mozmenuactive)
*aShouldRepaint = PR_TRUE;
}
@ -966,11 +965,6 @@ nsNativeThemeGTK::ThemeSupportsWidget(nsPresContext* aPresContext,
nsIFrame* aFrame,
PRUint8 aWidgetType)
{
if (aFrame) {
if (aFrame->GetContent()->IsNodeOfType(nsINode::eHTML))
return PR_FALSE;
}
if (IsWidgetTypeDisabled(mDisabledWidgetTypes, aWidgetType))
return PR_FALSE;
@ -1028,7 +1022,7 @@ nsNativeThemeGTK::ThemeSupportsWidget(nsPresContext* aPresContext,
case NS_THEME_TEXTFIELD:
case NS_THEME_TEXTFIELD_MULTILINE:
// case NS_THEME_TEXTFIELD_CARET:
case NS_THEME_DROPDOWN_BUTTON:
// case NS_THEME_DROPDOWN_BUTTON:
case NS_THEME_DROPDOWN_TEXTFIELD:
case NS_THEME_SCALE_HORIZONTAL:
case NS_THEME_SCALE_THUMB_HORIZONTAL:
@ -1070,11 +1064,15 @@ nsNativeThemeGTK::WidgetIsContainer(PRUint8 aWidgetType)
PRBool
nsNativeThemeGTK::ThemeDrawsFocusForWidget(nsPresContext* aPresContext, nsIFrame* aFrame, PRUint8 aWidgetType)
{
if (aWidgetType == NS_THEME_DROPDOWN ||
aWidgetType == NS_THEME_BUTTON)
return PR_TRUE;
return PR_FALSE;
}
PRBool
nsNativeThemeGTK::ThemeNeedsComboboxDropmarker()
{
return PR_TRUE;
return PR_FALSE;
}