--- a/mozilla-gtk3_20.patch Sun Apr 24 08:20:10 2016 +0200
+++ b/mozilla-gtk3_20.patch Thu Apr 28 17:08:03 2016 +0200
@@ -1,6 +1,6 @@
-diff -up firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.2/widget/gtk/gtk3drawing.c
---- firefox-45.0.2/widget/gtk/gtk3drawing.c.gtk3-20 2016-04-08 01:55:04.000000000 +0200
-+++ firefox-45.0.2/widget/gtk/gtk3drawing.c 2016-04-20 18:49:52.897795872 +0200
+diff -up firefox-46.0/widget/gtk/gtk3drawing.c.gtk3-20 firefox-46.0/widget/gtk/gtk3drawing.c
+--- firefox-46.0/widget/gtk/gtk3drawing.c.gtk3-20 2016-04-22 02:37:27.000000000 +0200
++++ firefox-46.0/widget/gtk/gtk3drawing.c 2016-04-25 14:56:19.006992927 +0200
@@ -17,32 +17,79 @@
#include <math.h>
@@ -372,7 +372,7 @@
}
if (gComboBoxEntryButtonWidget) {
-@@ -528,9 +719,21 @@ ensure_tab_widget()
+@@ -530,9 +721,21 @@ ensure_tab_widget()
static gint
ensure_progress_widget()
{
@@ -397,7 +397,7 @@
}
return MOZ_GTK_SUCCESS;
}
-@@ -636,6 +839,11 @@ static gint
+@@ -638,6 +841,11 @@ static gint
ensure_check_menu_item_widget()
{
if (!gCheckMenuItemWidget) {
@@ -409,7 +409,7 @@
ensure_menu_popup_widget();
gCheckMenuItemWidget = gtk_check_menu_item_new_with_label("M");
gtk_menu_shell_append(GTK_MENU_SHELL(gMenuPopupWidget),
-@@ -757,7 +965,7 @@ moz_gtk_checkbox_get_metrics(gint* indic
+@@ -752,7 +960,7 @@ moz_gtk_checkbox_get_metrics(gint* indic
{
ensure_checkbox_widget();
@@ -418,7 +418,7 @@
"indicator_size", indicator_size,
"indicator_spacing", indicator_spacing,
NULL);
-@@ -770,7 +978,7 @@ moz_gtk_radio_get_metrics(gint* indicato
+@@ -765,7 +973,7 @@ moz_gtk_radio_get_metrics(gint* indicato
{
ensure_radiobutton_widget();
@@ -427,7 +427,7 @@
"indicator_size", indicator_size,
"indicator_spacing", indicator_spacing,
NULL);
-@@ -783,13 +991,12 @@ moz_gtk_get_focus_outline_size(gint* foc
+@@ -778,13 +986,12 @@ moz_gtk_get_focus_outline_size(gint* foc
{
GtkBorder border;
GtkBorder padding;
@@ -444,7 +444,7 @@
*focus_h_width = border.left + padding.left;
*focus_v_width = border.top + padding.top;
return MOZ_GTK_SUCCESS;
-@@ -826,7 +1033,7 @@ moz_gtk_button_get_default_overflow(gint
+@@ -821,7 +1028,7 @@ moz_gtk_button_get_default_overflow(gint
GtkBorder* default_outside_border;
ensure_button_widget();
@@ -453,7 +453,7 @@
"default-outside-border", &default_outside_border,
NULL);
-@@ -849,7 +1056,7 @@ moz_gtk_button_get_default_border(gint*
+@@ -844,7 +1051,7 @@ moz_gtk_button_get_default_border(gint*
GtkBorder* default_border;
ensure_button_widget();
@@ -462,7 +462,7 @@
"default-border", &default_border,
NULL);
-@@ -940,7 +1147,7 @@ moz_gtk_button_paint(cairo_t *cr, GdkRec
+@@ -935,7 +1142,7 @@ moz_gtk_button_paint(cairo_t *cr, GdkRec
if (state->focused) {
GtkBorder border;
@@ -471,7 +471,7 @@
x += border.left;
y += border.top;
width -= (border.left + border.right);
-@@ -961,15 +1168,14 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec
+@@ -956,15 +1163,14 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec
gint indicator_size, indicator_spacing;
gint x, y, width, height;
gint focus_x, focus_y, focus_width, focus_height;
@@ -490,7 +490,7 @@
}
// XXX we should assert rect->height >= indicator_size too
-@@ -988,11 +1194,9 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec
+@@ -983,11 +1189,9 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec
focus_width = width + 2 * indicator_spacing;
focus_height = height + 2 * indicator_spacing;
@@ -505,7 +505,7 @@
if (selected)
state_flags |= checkbox_check_state;
-@@ -1000,13 +1204,15 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec
+@@ -995,13 +1199,15 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec
if (inconsistent)
state_flags |= GTK_STATE_FLAG_INCONSISTENT;
@@ -525,7 +525,7 @@
focus_width, focus_height);
}
}
-@@ -1015,15 +1221,14 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec
+@@ -1010,15 +1216,14 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec
* 'indeterminate' type on checkboxes. In GTK, the shadow type
* must also be changed for the state to be drawn.
*/
@@ -545,7 +545,7 @@
return MOZ_GTK_SUCCESS;
}
-@@ -1040,8 +1245,8 @@ calculate_button_inner_rect(GtkWidget* b
+@@ -1035,8 +1240,8 @@ calculate_button_inner_rect(GtkWidget* b
style = gtk_widget_get_style_context(button);
/* This mirrors gtkbutton's child positioning */
@@ -556,7 +556,7 @@
inner_rect->x = rect->x + border.left + padding.left;
inner_rect->y = rect->y + padding.top + border.top;
-@@ -1107,9 +1312,9 @@ moz_gtk_scrollbar_button_paint(cairo_t *
+@@ -1099,9 +1304,9 @@ moz_gtk_scrollbar_button_paint(cairo_t *
ensure_scrollbar_widget();
if (flags & MOZ_GTK_STEPPER_VERTICAL)
@@ -568,7 +568,7 @@
gtk_widget_set_direction(scrollbar, direction);
-@@ -1175,26 +1380,23 @@ moz_gtk_scrollbar_trough_paint(GtkThemeW
+@@ -1181,25 +1386,22 @@ moz_gtk_scrollbar_trough_paint(GtkThemeW
GtkTextDirection direction)
{
GtkStyleContext* style;
@@ -576,21 +576,13 @@
ensure_scrollbar_widget();
-- if (widget == MOZ_GTK_SCROLLBAR_TRACK_HORIZONTAL)
+- if (widget == MOZ_GTK_SCROLLBAR_HORIZONTAL)
- scrollbar = GTK_SCROLLBAR(gHorizScrollbarWidget);
- else
- scrollbar = GTK_SCROLLBAR(gVertScrollbarWidget);
-
- gtk_widget_set_direction(GTK_WIDGET(scrollbar), direction);
-+ if (widget == MOZ_GTK_SCROLLBAR_TRACK_HORIZONTAL) {
-+ gtk_widget_set_direction(GTK_WIDGET(gHorizScrollbar.widget), direction);
-+ style = gHorizScrollbar.scroll.style;
-+ }
-+ else {
-+ gtk_widget_set_direction(GTK_WIDGET(gVertScrollbar.widget), direction);
-+ style = gVertScrollbar.scroll.style;
-+ }
-
+-
if (flags & MOZ_GTK_TRACK_OPAQUE) {
style = gtk_widget_get_style_context(GTK_WIDGET(gProtoWindow));
gtk_render_background(style, cr, rect->x, rect->y, rect->width, rect->height);
@@ -599,11 +591,18 @@
- style = gtk_widget_get_style_context(GTK_WIDGET(scrollbar));
- gtk_style_context_save(style);
- gtk_style_context_add_class(style, GTK_STYLE_CLASS_TROUGH);
--
++ if (widget == MOZ_GTK_SCROLLBAR_HORIZONTAL) {
++ gtk_widget_set_direction(GTK_WIDGET(gHorizScrollbar.widget), direction);
++ style = gHorizScrollbar.scroll.style;
++ }
++ else {
++ gtk_widget_set_direction(GTK_WIDGET(gVertScrollbar.widget), direction);
++ style = gVertScrollbar.scroll.style;
++ }
+
gtk_render_background(style, cr, rect->x, rect->y, rect->width, rect->height);
gtk_render_frame(style, cr, rect->x, rect->y, rect->width, rect->height);
-
-@@ -1202,7 +1404,6 @@ moz_gtk_scrollbar_trough_paint(GtkThemeW
+@@ -1208,7 +1410,6 @@ moz_gtk_scrollbar_trough_paint(GtkThemeW
gtk_render_focus(style, cr,
rect->x, rect->y, rect->width, rect->height);
}
@@ -611,12 +610,11 @@
return MOZ_GTK_SUCCESS;
}
-@@ -1214,25 +1415,21 @@ moz_gtk_scrollbar_thumb_paint(GtkThemeWi
+@@ -1220,24 +1421,20 @@ moz_gtk_scrollbar_thumb_paint(GtkThemeWi
{
GtkStateFlags state_flags = GetStateFlagsFromGtkWidgetState(state);
GtkStyleContext* style;
- GtkScrollbar *scrollbar;
- GtkAdjustment *adj;
GtkBorder margin;
ensure_scrollbar_widget();
@@ -635,7 +633,7 @@
+ gtk_widget_set_direction(GTK_WIDGET(gHorizScrollbar.widget), direction);
+ }
+ else {
-+ style = gVertScrollbar.scroll.styleSlider;
++ style = gVertScrollbar.scroll.styleSlider;
+ gtk_widget_set_direction(GTK_WIDGET(gVertScrollbar.widget), direction);
+ }
@@ -645,7 +643,7 @@
gtk_style_context_get_margin (style, state_flags, &margin);
gtk_render_slider(style, cr,
-@@ -1243,8 +1440,6 @@ moz_gtk_scrollbar_thumb_paint(GtkThemeWi
+@@ -1248,8 +1445,6 @@ moz_gtk_scrollbar_thumb_paint(GtkThemeWi
(widget == MOZ_GTK_SCROLLBAR_THUMB_HORIZONTAL) ?
GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL);
@@ -654,7 +652,7 @@
return MOZ_GTK_SUCCESS;
}
-@@ -1255,8 +1450,8 @@ moz_gtk_spin_paint(cairo_t *cr, GdkRecta
+@@ -1260,8 +1455,8 @@ moz_gtk_spin_paint(cairo_t *cr, GdkRecta
GtkStyleContext* style;
ensure_spin_widget();
@@ -665,7 +663,7 @@
gtk_style_context_save(style);
gtk_style_context_add_class(style, GTK_STYLE_CLASS_SPINBUTTON);
gtk_render_background(style, cr, rect->x, rect->y, rect->width, rect->height);
-@@ -1275,11 +1470,10 @@ moz_gtk_spin_updown_paint(cairo_t *cr, G
+@@ -1280,11 +1475,10 @@ moz_gtk_spin_updown_paint(cairo_t *cr, G
GtkStyleContext* style;
ensure_spin_widget();
@@ -679,7 +677,7 @@
gtk_render_background(style, cr, rect->x, rect->y, rect->width, rect->height);
gtk_render_frame(style, cr, rect->x, rect->y, rect->width, rect->height);
-@@ -1445,15 +1639,13 @@ moz_gtk_vpaned_paint(cairo_t *cr, GdkRec
+@@ -1450,15 +1644,13 @@ moz_gtk_vpaned_paint(cairo_t *cr, GdkRec
static gint
moz_gtk_entry_paint(cairo_t *cr, GdkRectangle* rect,
GtkWidgetState* state,
@@ -698,7 +696,7 @@
if (draw_focus_outline_only) {
// Inflate the given 'rect' with the focus outline size.
-@@ -1473,10 +1665,9 @@ moz_gtk_entry_paint(cairo_t *cr, GdkRect
+@@ -1478,10 +1670,9 @@ moz_gtk_entry_paint(cairo_t *cr, GdkRect
* textarea window uses gtk_paint_flat_box when exposed */
/* This gets us a lovely greyish disabledish look */
@@ -710,7 +708,7 @@
/* Now paint the shadow and focus border.
* We do like in gtk_entry_draw_frame, we first draw the shadow, a tad
-@@ -1526,7 +1717,7 @@ moz_gtk_treeview_paint(cairo_t *cr, GdkR
+@@ -1531,7 +1722,7 @@ moz_gtk_treeview_paint(cairo_t *cr, GdkR
style = gtk_widget_get_style_context(gScrolledWindowWidget);
gtk_style_context_save(style);
gtk_style_context_add_class(style, GTK_STYLE_CLASS_FRAME);
@@ -719,7 +717,7 @@
xthickness = border.left;
ythickness = border.top;
-@@ -1697,7 +1888,7 @@ moz_gtk_combo_box_paint(cairo_t *cr, Gdk
+@@ -1702,7 +1893,7 @@ moz_gtk_combo_box_paint(cairo_t *cr, Gdk
if (direction == GTK_TEXT_DIR_LTR) {
GtkBorder padding;
GtkStateFlags state_flags = GetStateFlagsFromGtkWidgetState(state);
@@ -728,7 +726,7 @@
arrow_rect.x -= padding.left;
}
else
-@@ -1799,29 +1990,27 @@ moz_gtk_container_paint(cairo_t *cr, Gdk
+@@ -1804,29 +1995,27 @@ moz_gtk_container_paint(cairo_t *cr, Gdk
gboolean isradio, GtkTextDirection direction)
{
GtkStateFlags state_flags = GetStateFlagsFromGtkWidgetState(state);
@@ -766,7 +764,7 @@
return MOZ_GTK_SUCCESS;
}
-@@ -1831,32 +2020,26 @@ moz_gtk_toggle_label_paint(cairo_t *cr,
+@@ -1836,32 +2025,26 @@ moz_gtk_toggle_label_paint(cairo_t *cr,
GtkWidgetState* state,
gboolean isradio, GtkTextDirection direction)
{
@@ -808,7 +806,7 @@
return MOZ_GTK_SUCCESS;
}
-@@ -1917,7 +2100,7 @@ moz_gtk_toolbar_separator_paint(cairo_t
+@@ -1922,7 +2105,7 @@ moz_gtk_toolbar_separator_paint(cairo_t
rect->height * (end_fraction - start_fraction));
} else {
GtkBorder padding;
@@ -817,7 +815,7 @@
paint_width = padding.left;
if (paint_width > rect->width)
-@@ -2004,18 +2187,13 @@ static gint
+@@ -2006,18 +2189,13 @@ static gint
moz_gtk_progressbar_paint(cairo_t *cr, GdkRectangle* rect,
GtkTextDirection direction)
{
@@ -841,7 +839,7 @@
return MOZ_GTK_SUCCESS;
}
-@@ -2025,15 +2203,8 @@ moz_gtk_progress_chunk_paint(cairo_t *cr
+@@ -2027,15 +2205,8 @@ moz_gtk_progress_chunk_paint(cairo_t *cr
GtkTextDirection direction,
GtkThemeWidgetType widget)
{
@@ -858,7 +856,7 @@
if (widget == MOZ_GTK_PROGRESS_CHUNK_INDETERMINATE ||
widget == MOZ_GTK_PROGRESS_CHUNK_VERTICAL_INDETERMINATE) {
-@@ -2072,12 +2243,14 @@ moz_gtk_progress_chunk_paint(cairo_t *cr
+@@ -2074,12 +2245,14 @@ moz_gtk_progress_chunk_paint(cairo_t *cr
// gtk_render_activity was used to render progress chunks on GTK versions
// before 3.13.7, see bug 1173907.
if (!gtk_check_version(3, 13, 7)) {
@@ -877,7 +875,7 @@
return MOZ_GTK_SUCCESS;
}
-@@ -2094,7 +2267,7 @@ moz_gtk_get_tab_thickness(void)
+@@ -2096,7 +2269,7 @@ moz_gtk_get_tab_thickness(void)
style = gtk_widget_get_style_context(gTabWidget);
gtk_style_context_add_class(style, GTK_STYLE_CLASS_NOTEBOOK);
@@ -886,7 +884,7 @@
if (border.top < 2)
return 2; /* some themes don't set ythickness correctly */
-@@ -2290,7 +2463,7 @@ moz_gtk_tab_paint(cairo_t *cr, GdkRectan
+@@ -2292,7 +2465,7 @@ moz_gtk_tab_paint(cairo_t *cr, GdkRectan
gtk_style_context_save(style);
moz_gtk_tab_prepare_style_context(style, flags);
@@ -895,7 +893,7 @@
focusRect.x += padding.left;
focusRect.width -= (padding.left + padding.right);
-@@ -2406,7 +2579,7 @@ moz_gtk_tab_scroll_arrow_paint(cairo_t *
+@@ -2408,7 +2581,7 @@ moz_gtk_tab_scroll_arrow_paint(cairo_t *
}
static gint
@@ -904,7 +902,7 @@
GtkTextDirection direction)
{
GtkStyleContext* style;
-@@ -2467,7 +2640,7 @@ moz_gtk_menu_separator_paint(cairo_t *cr
+@@ -2468,7 +2641,7 @@ moz_gtk_menu_separator_paint(cairo_t *cr
border_width = gtk_container_get_border_width(GTK_CONTAINER(gMenuSeparatorWidget));
style = gtk_widget_get_style_context(gMenuSeparatorWidget);
@@ -1137,7 +1135,7 @@
moz_gtk_get_tab_scroll_arrow_size(gint* width, gint* height)
{
gint arrow_size;
-@@ -3022,7 +3240,7 @@ moz_gtk_get_toolbar_separator_width(gint
+@@ -3030,7 +3248,7 @@ moz_gtk_get_toolbar_separator_width(gint
"separator-width", &separator_width,
NULL);
/* Just in case... */
@@ -1146,7 +1144,7 @@
*size = MAX(*size, (wide_separators ? separator_width : border.left));
return MOZ_GTK_SUCCESS;
}
-@@ -3064,7 +3282,7 @@ moz_gtk_get_menu_separator_height(gint *
+@@ -3072,7 +3290,7 @@ moz_gtk_get_menu_separator_height(gint *
border_width = gtk_container_get_border_width(GTK_CONTAINER(gMenuSeparatorWidget));
style = gtk_widget_get_style_context(gMenuSeparatorWidget);
@@ -1155,7 +1153,7 @@
gtk_style_context_save(style);
gtk_style_context_add_class(style, GTK_STYLE_CLASS_SEPARATOR);
-@@ -3122,15 +3340,21 @@ moz_gtk_get_scrollbar_metrics(MozGtkScro
+@@ -3130,15 +3348,21 @@ moz_gtk_get_scrollbar_metrics(MozGtkScro
{
ensure_scrollbar_widget();
@@ -1180,7 +1178,7 @@
return MOZ_GTK_SUCCESS;
}
-@@ -3155,7 +3379,7 @@ moz_gtk_images_in_buttons()
+@@ -3163,7 +3387,7 @@ moz_gtk_images_in_buttons()
GtkSettings* settings;
ensure_button_widget();
@@ -1189,7 +1187,7 @@
g_object_get(settings, "gtk-button-images", &result, NULL);
return result;
-@@ -3183,7 +3407,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType
+@@ -3191,7 +3415,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType
}
ensure_button_widget();
return moz_gtk_button_paint(cr, rect, state,
@@ -1198,7 +1196,7 @@
direction);
break;
case MOZ_GTK_CHECKBUTTON:
-@@ -3233,7 +3457,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType
+@@ -3241,7 +3465,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType
case MOZ_GTK_SPINBUTTON_ENTRY:
ensure_spin_widget();
return moz_gtk_entry_paint(cr, rect, state,
@@ -1207,7 +1205,7 @@
break;
case MOZ_GTK_GRIPPER:
return moz_gtk_gripper_paint(cr, rect, state,
-@@ -3260,7 +3484,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType
+@@ -3268,7 +3492,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType
case MOZ_GTK_ENTRY:
ensure_entry_widget();
return moz_gtk_entry_paint(cr, rect, state,
@@ -1216,7 +1214,7 @@
break;
case MOZ_GTK_DROPDOWN:
return moz_gtk_combo_box_paint(cr, rect, state, direction);
-@@ -3272,7 +3496,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType
+@@ -3280,7 +3504,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType
case MOZ_GTK_DROPDOWN_ENTRY:
ensure_combo_box_entry_widgets();
return moz_gtk_entry_paint(cr, rect, state,
@@ -1225,7 +1223,7 @@
break;
case MOZ_GTK_CHECKBUTTON_CONTAINER:
case MOZ_GTK_RADIOBUTTON_CONTAINER:
-@@ -3324,7 +3548,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType
+@@ -3332,7 +3556,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType
(GtkArrowType) flags, direction);
break;
case MOZ_GTK_MENUBAR:
@@ -1234,7 +1232,7 @@
break;
case MOZ_GTK_MENUPOPUP:
return moz_gtk_menu_popup_paint(cr, rect, direction);
-@@ -3375,7 +3599,7 @@ GtkWidget* moz_gtk_get_scrollbar_widget(
+@@ -3383,7 +3607,7 @@ GtkWidget* moz_gtk_get_scrollbar_widget(
{
MOZ_ASSERT(is_initialized, "Forgot to call moz_gtk_init()");
ensure_scrollbar_widget();
@@ -1243,7 +1241,7 @@
}
gboolean moz_gtk_has_scrollbar_buttons(void)
-@@ -3383,7 +3607,7 @@ gboolean moz_gtk_has_scrollbar_buttons(v
+@@ -3391,7 +3615,7 @@ gboolean moz_gtk_has_scrollbar_buttons(v
gboolean backward, forward, secondary_backward, secondary_forward;
MOZ_ASSERT(is_initialized, "Forgot to call moz_gtk_init()");
ensure_scrollbar_widget();
@@ -1252,7 +1250,7 @@
"has-backward-stepper", &backward,
"has-forward-stepper", &forward,
"has-secondary-backward-stepper", &secondary_backward,
-@@ -3409,17 +3633,19 @@ moz_gtk_shutdown()
+@@ -3415,17 +3639,19 @@ moz_gtk_shutdown()
gProtoWindow = NULL;
gProtoLayout = NULL;
@@ -1279,7 +1277,7 @@
gComboBoxWidget = NULL;
gComboBoxButtonWidget = NULL;
gComboBoxSeparatorWidget = NULL;
-@@ -3427,12 +3653,12 @@ moz_gtk_shutdown()
+@@ -3433,12 +3659,12 @@ moz_gtk_shutdown()
gComboBoxEntryWidget = NULL;
gComboBoxEntryButtonWidget = NULL;
gComboBoxEntryArrowWidget = NULL;
@@ -1294,9 +1292,9 @@
gTabWidget = NULL;
gTooltipWidget = NULL;
gMenuBarWidget = NULL;
-diff -up firefox-45.0.2/widget/gtk/gtkdrawing.h.gtk3-20 firefox-45.0.2/widget/gtk/gtkdrawing.h
---- firefox-45.0.2/widget/gtk/gtkdrawing.h.gtk3-20 2016-04-08 01:55:04.000000000 +0200
-+++ firefox-45.0.2/widget/gtk/gtkdrawing.h 2016-04-20 15:00:29.468048948 +0200
+diff -up firefox-46.0/widget/gtk/gtkdrawing.h.gtk3-20 firefox-46.0/widget/gtk/gtkdrawing.h
+--- firefox-46.0/widget/gtk/gtkdrawing.h.gtk3-20 2016-04-22 02:37:27.000000000 +0200
++++ firefox-46.0/widget/gtk/gtkdrawing.h 2016-04-25 14:42:42.000000000 +0200
@@ -67,6 +67,13 @@ typedef enum {
MOZ_GTK_TAB_SELECTED = 1 << 10
} GtkTabFlags;
@@ -1311,18 +1309,17 @@
/** flags for menuitems **/
typedef enum {
/* menuitem is part of the menubar */
-@@ -394,6 +401,10 @@ gint moz_gtk_get_tab_scroll_arrow_size(g
- */
- gint moz_gtk_get_arrow_size(gint* width, gint* height);
+@@ -396,6 +403,9 @@ void
+ moz_gtk_get_arrow_size(GtkThemeWidgetType widgetType,
+ gint* width, gint* height);
+gint moz_gtk_get_entry_height(gint* height);
-+
+gint moz_gtk_get_button_height(gint* height);
+
/**
* Get the desired size of a toolbar separator
* size: [OUT] the desired width
-@@ -464,6 +475,12 @@ gboolean moz_gtk_images_in_buttons(void)
+@@ -466,6 +476,12 @@ gboolean moz_gtk_images_in_buttons(void)
*/
gboolean moz_gtk_has_scrollbar_buttons(void);
@@ -1335,10 +1332,10 @@
#ifdef __cplusplus
}
#endif /* __cplusplus */
-diff -up firefox-45.0.2/widget/gtk/mozgtk/mozgtk.c.gtk3-20 firefox-45.0.2/widget/gtk/mozgtk/mozgtk.c
---- firefox-45.0.2/widget/gtk/mozgtk/mozgtk.c.gtk3-20 2016-04-20 15:00:29.443048846 +0200
-+++ firefox-45.0.2/widget/gtk/mozgtk/mozgtk.c 2016-04-20 15:00:29.469048952 +0200
-@@ -503,6 +503,11 @@ STUB(gtk_window_set_type_hint)
+diff -up firefox-46.0/widget/gtk/mozgtk/mozgtk.c.gtk3-20 firefox-46.0/widget/gtk/mozgtk/mozgtk.c
+--- firefox-46.0/widget/gtk/mozgtk/mozgtk.c.gtk3-20 2016-04-22 02:37:27.000000000 +0200
++++ firefox-46.0/widget/gtk/mozgtk/mozgtk.c 2016-04-25 14:46:15.299592716 +0200
+@@ -504,6 +504,11 @@ STUB(gtk_window_set_type_hint)
STUB(gtk_window_set_wmclass)
STUB(gtk_window_unfullscreen)
STUB(gtk_window_unmaximize)
@@ -1350,15 +1347,7 @@
#endif
#ifdef GTK3_SYMBOLS
-@@ -550,6 +555,7 @@ STUB(gtk_style_context_get_border_color)
- STUB(gtk_style_context_get_color)
- STUB(gtk_style_context_get_margin)
- STUB(gtk_style_context_get_padding)
-+STUB(gtk_style_context_get_state)
- STUB(gtk_style_context_has_class)
- STUB(gtk_style_context_new)
- STUB(gtk_style_context_remove_class)
-@@ -577,6 +583,13 @@ STUB(gtk_color_chooser_get_type)
+@@ -581,6 +586,13 @@ STUB(gtk_color_chooser_get_type)
STUB(gtk_color_chooser_set_rgba)
STUB(gtk_color_chooser_get_rgba)
STUB(gtk_color_chooser_set_use_alpha)
@@ -1372,10 +1361,10 @@
#endif
#ifdef GTK2_SYMBOLS
-diff -up firefox-45.0.2/widget/gtk/nsLookAndFeel.cpp.gtk3-20 firefox-45.0.2/widget/gtk/nsLookAndFeel.cpp
---- firefox-45.0.2/widget/gtk/nsLookAndFeel.cpp.gtk3-20 2016-04-08 01:55:04.000000000 +0200
-+++ firefox-45.0.2/widget/gtk/nsLookAndFeel.cpp 2016-04-20 15:00:29.469048952 +0200
-@@ -232,14 +232,18 @@ nsLookAndFeel::NativeGetColor(ColorID aI
+diff -up firefox-46.0/widget/gtk/nsLookAndFeel.cpp.gtk3-20 firefox-46.0/widget/gtk/nsLookAndFeel.cpp
+--- firefox-46.0/widget/gtk/nsLookAndFeel.cpp.gtk3-20 2016-04-22 02:37:27.000000000 +0200
++++ firefox-46.0/widget/gtk/nsLookAndFeel.cpp 2016-04-25 14:18:25.000000000 +0200
+@@ -353,14 +353,18 @@ nsLookAndFeel::NativeGetColor(ColorID aI
case eColorID_activeborder:
// active window border
gtk_style_context_get_border_color(mBackgroundStyle,
@@ -1396,7 +1385,7 @@
aColor = GDK_RGBA_TO_NS_RGBA(gdk_color);
break;
case eColorID_graytext: // disabled text in windows, menus, etc.
-@@ -248,9 +252,12 @@ nsLookAndFeel::NativeGetColor(ColorID aI
+@@ -369,9 +373,12 @@ nsLookAndFeel::NativeGetColor(ColorID aI
break;
case eColorID_inactivecaption:
// inactive window caption
@@ -1410,7 +1399,7 @@
aColor = GDK_RGBA_TO_NS_RGBA(gdk_color);
break;
#endif
-@@ -376,13 +383,17 @@ nsLookAndFeel::NativeGetColor(ColorID aI
+@@ -497,13 +504,17 @@ nsLookAndFeel::NativeGetColor(ColorID aI
case eColorID__moz_buttondefault:
// default button border color
gtk_style_context_get_border_color(mButtonStyle,
@@ -1430,7 +1419,7 @@
aColor = GDK_RGBA_TO_NS_RGBA(gdk_color);
break;
case eColorID__moz_buttonhovertext:
-@@ -989,7 +1000,7 @@ nsLookAndFeel::Init()
+@@ -1110,7 +1121,7 @@ nsLookAndFeel::Init()
style = create_context(path);
gtk_style_context_add_class(style, GTK_STYLE_CLASS_SCROLLBAR);
gtk_style_context_add_class(style, GTK_STYLE_CLASS_TROUGH);
@@ -1439,7 +1428,7 @@
sMozScrollbar = GDK_RGBA_TO_NS_RGBA(color);
g_object_unref(style);
-@@ -997,18 +1008,18 @@ nsLookAndFeel::Init()
+@@ -1118,18 +1129,18 @@ nsLookAndFeel::Init()
style = create_context(path);
gtk_style_context_save(style);
gtk_style_context_add_class(style, GTK_STYLE_CLASS_BACKGROUND);
@@ -1462,7 +1451,7 @@
sInfoText = GDK_RGBA_TO_NS_RGBA(color);
g_object_unref(style);
-@@ -1023,20 +1034,26 @@ nsLookAndFeel::Init()
+@@ -1144,20 +1155,26 @@ nsLookAndFeel::Init()
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
style = gtk_widget_get_style_context(accel_label);
@@ -1494,7 +1483,7 @@
g_object_unref(menu);
#endif
-@@ -1145,44 +1162,54 @@ nsLookAndFeel::Init()
+@@ -1266,44 +1283,54 @@ nsLookAndFeel::Init()
GDK_COLOR_TO_NS_RGB(style->dark[GTK_STATE_NORMAL]);
}
#else
@@ -1566,7 +1555,7 @@
// GTK's guide to fancy odd row background colors:
// 1) Check if a theme explicitly defines an odd row color
-@@ -1195,7 +1222,7 @@ nsLookAndFeel::Init()
+@@ -1316,7 +1343,7 @@ nsLookAndFeel::Init()
// Get odd row background color
gtk_style_context_save(style);
gtk_style_context_add_region(style, GTK_STYLE_REGION_ROW, GTK_REGION_ODD);
@@ -1575,16 +1564,7 @@
sOddCellBackground = GDK_RGBA_TO_NS_RGBA(color);
gtk_style_context_restore(style);
-@@ -1205,7 +1232,7 @@ nsLookAndFeel::Init()
- // TODO GTK3 - update sFrameOuterLightBorder
- // for GTK_BORDER_STYLE_INSET/OUTSET/GROVE/RIDGE border styles (Bug 978172).
- style = gtk_widget_get_style_context(frame);
-- gtk_style_context_get_border_color(style, GTK_STATE_FLAG_NORMAL, &color);
-+ gtk_style_context_get_border_color(style, gtk_style_context_get_state(style), &color);
- sFrameInnerDarkBorder = sFrameOuterLightBorder = GDK_RGBA_TO_NS_RGBA(color);
-
- gtk_widget_path_free(path);
-@@ -1217,9 +1244,11 @@ nsLookAndFeel::Init()
+@@ -1334,9 +1361,11 @@ nsLookAndFeel::Init()
gtk_container_add(GTK_CONTAINER(parent), infoBar);
gtk_container_add(GTK_CONTAINER(infoBarContent), infoBarLabel);
style = gtk_widget_get_style_context(infoBarLabel);
@@ -1597,10 +1577,10 @@
#endif
// Some themes have a unified menu bar, and support window dragging on it
gboolean supports_menubar_drag = FALSE;
-diff -up firefox-45.0.2/widget/gtk/nsNativeThemeGTK.cpp.gtk3-20 firefox-45.0.2/widget/gtk/nsNativeThemeGTK.cpp
---- firefox-45.0.2/widget/gtk/nsNativeThemeGTK.cpp.gtk3-20 2016-04-08 01:55:04.000000000 +0200
-+++ firefox-45.0.2/widget/gtk/nsNativeThemeGTK.cpp 2016-04-20 15:00:29.469048952 +0200
-@@ -1548,9 +1548,6 @@ nsNativeThemeGTK::GetMinimumWidgetSize(n
+diff -up firefox-46.0/widget/gtk/nsNativeThemeGTK.cpp.gtk3-20 firefox-46.0/widget/gtk/nsNativeThemeGTK.cpp
+--- firefox-46.0/widget/gtk/nsNativeThemeGTK.cpp.gtk3-20 2016-04-25 14:46:15.300592722 +0200
++++ firefox-46.0/widget/gtk/nsNativeThemeGTK.cpp 2016-04-25 14:40:42.000000000 +0200
+@@ -1567,9 +1567,6 @@ nsNativeThemeGTK::GetMinimumWidgetSize(n
case NS_THEME_RADIO_CONTAINER:
case NS_THEME_CHECKBOX_LABEL:
case NS_THEME_RADIO_LABEL:
@@ -1609,12 +1589,11 @@
- case NS_THEME_TOOLBAR_BUTTON:
case NS_THEME_TREEVIEW_HEADER_CELL:
{
- // Just include our border, and let the box code augment the size.
-@@ -1560,6 +1557,21 @@ nsNativeThemeGTK::GetMinimumWidgetSize(n
- aResult->width = border.left + border.right;
- aResult->height = border.top + border.bottom;
+ if (aWidgetType == NS_THEME_DROPDOWN) {
+@@ -1588,6 +1585,21 @@ nsNativeThemeGTK::GetMinimumWidgetSize(n
+ aResult->height += border.top + border.bottom;
}
-+ break;
+ break;
+ case NS_THEME_BUTTON:
+ case NS_THEME_DROPDOWN:
+ case NS_THEME_TOOLBAR_BUTTON:
@@ -1629,7 +1608,8 @@
+ {
+ moz_gtk_get_entry_height(&aResult->height);
+ }
- break;
++ break;
case NS_THEME_TOOLBAR_SEPARATOR:
{
+ gint separator_width;
--- a/mozilla-kde.patch Sun Apr 24 08:20:10 2016 +0200
+++ b/mozilla-kde.patch Thu Apr 28 17:08:03 2016 +0200
@@ -1,5 +1,5 @@
# HG changeset patch
-# Parent 797d5f17b080f54439602f107ecaf6b09a0ef5c1
+# Parent 61cdc9af8ceaf75083e751e0d6497feddc26f7ba
Description: Add KDE integration to Firefox (toolkit parts)
Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Author: Lubos Lunak <lunak@suse.com>
@@ -9,7 +9,7 @@
diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
--- a/modules/libpref/Preferences.cpp
+++ b/modules/libpref/Preferences.cpp
-@@ -30,16 +30,17 @@
+@@ -31,16 +31,17 @@
#include "nsIZipReader.h"
#include "nsPrefBranch.h"
#include "nsXPIDLString.h"
@@ -27,7 +27,7 @@
#include "prefread.h"
#include "prefapi_private_data.h"
-@@ -1136,16 +1137,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
+@@ -1135,16 +1136,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
static nsresult pref_LoadPrefsInDirList(const char *listId)
{
@@ -62,7 +62,7 @@
return NS_OK;
bool hasMore;
-@@ -1161,17 +1180,17 @@ static nsresult pref_LoadPrefsInDirList(
+@@ -1160,17 +1179,17 @@ static nsresult pref_LoadPrefsInDirList(
nsAutoCString leaf;
path->GetNativeLeafName(leaf);
@@ -81,7 +81,7 @@
{
nsZipItemPtr<char> manifest(jarReader, name, true);
NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
-@@ -1265,26 +1284,38 @@ static nsresult pref_InitInitialObjects(
+@@ -1264,24 +1283,36 @@ static nsresult pref_InitInitialObjects(
/* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */
static const char* specialFiles[] = {
#if defined(XP_MACOSX)
@@ -91,9 +91,7 @@
#elif defined(XP_UNIX)
"unix.js"
+ , "" // placeholder for KDE (empty is otherwise harmless)
- #if defined(VMS)
- , "openvms.js"
- #elif defined(_AIX)
+ #if defined(_AIX)
, "aix.js"
#endif
#elif defined(XP_BEOS)
@@ -189,7 +187,7 @@
diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build
--- a/toolkit/components/downloads/moz.build
+++ b/toolkit/components/downloads/moz.build
-@@ -65,15 +65,16 @@ if not CONFIG['MOZ_SUITE']:
+@@ -64,15 +64,16 @@ if not CONFIG['MOZ_SUITE']:
'nsDownloadManagerUI.js',
'nsDownloadManagerUI.manifest',
]
@@ -278,31 +276,31 @@
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
-@@ -64,29 +64,33 @@ toolkit.jar:
+@@ -72,29 +72,33 @@ toolkit.jar:
content/global/viewZoomOverlay.js
- *+ content/global/bindings/autocomplete.xml (widgets/autocomplete.xml)
+ content/global/bindings/autocomplete.xml (widgets/autocomplete.xml)
content/global/bindings/browser.xml (widgets/browser.xml)
content/global/bindings/button.xml (widgets/button.xml)
content/global/bindings/checkbox.xml (widgets/checkbox.xml)
content/global/bindings/colorpicker.xml (widgets/colorpicker.xml)
content/global/bindings/datetimepicker.xml (widgets/datetimepicker.xml)
- *+ content/global/bindings/dialog.xml (widgets/dialog.xml)
-+*+ content/global/bindings/dialog-kde.xml (widgets/dialog-kde.xml)
+ * content/global/bindings/dialog.xml (widgets/dialog.xml)
++* content/global/bindings/dialog-kde.xml (widgets/dialog-kde.xml)
+% override chrome://global/content/bindings/dialog.xml chrome://global/content/bindings/dialog-kde.xml desktop=kde
content/global/bindings/editor.xml (widgets/editor.xml)
content/global/bindings/expander.xml (widgets/expander.xml)
- * content/global/bindings/filefield.xml (widgets/filefield.xml)
- *+ content/global/bindings/findbar.xml (widgets/findbar.xml)
+ content/global/bindings/filefield.xml (widgets/filefield.xml)
+ * content/global/bindings/findbar.xml (widgets/findbar.xml)
content/global/bindings/general.xml (widgets/general.xml)
content/global/bindings/groupbox.xml (widgets/groupbox.xml)
- *+ content/global/bindings/listbox.xml (widgets/listbox.xml)
+ content/global/bindings/listbox.xml (widgets/listbox.xml)
content/global/bindings/menu.xml (widgets/menu.xml)
content/global/bindings/menulist.xml (widgets/menulist.xml)
content/global/bindings/notification.xml (widgets/notification.xml)
content/global/bindings/numberbox.xml (widgets/numberbox.xml)
content/global/bindings/popup.xml (widgets/popup.xml)
- *+ content/global/bindings/preferences.xml (widgets/preferences.xml)
-+*+ content/global/bindings/preferences-kde.xml (widgets/preferences-kde.xml)
+ * content/global/bindings/preferences.xml (widgets/preferences.xml)
++* content/global/bindings/preferences-kde.xml (widgets/preferences-kde.xml)
+% override chrome://global/content/bindings/preferences.xml chrome://global/content/bindings/preferences-kde.xml desktop=kde
content/global/bindings/progressmeter.xml (widgets/progressmeter.xml)
content/global/bindings/radio.xml (widgets/radio.xml)
@@ -316,7 +314,7 @@
new file mode 100644
--- /dev/null
+++ b/toolkit/content/widgets/dialog-kde.xml
-@@ -0,0 +1,460 @@
+@@ -0,0 +1,463 @@
+<?xml version="1.0"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -350,7 +348,7 @@
+ <xul:button dlgtype="accept" class="dialog-button" xbl:inherits="disabled=buttondisabledaccept"/>
+#elif XP_UNIX
+ >
-+ <xul:button dlgtype="help" class="dialog-button" hidden="true"/>
++ <xul:button dlgtype="help" class="dialog-button" hidden="true"/>
+ <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
+ <xul:spacer anonid="spacer" flex="1"/>
+ <xul:button dlgtype="accept" class="dialog-button" xbl:inherits="disabled=buttondisabledaccept"/>
@@ -491,6 +489,9 @@
+ <parameter name="aEvent"/>
+ <body>
+ <![CDATA[
++ let { AppConstants } =
++ Components.utils.import("resource://gre/modules/AppConstants.jsm", {});
++
+ function focusInit() {
+ const dialog = document.documentElement;
+ const defaultButton = dialog.getButton(dialog.defaultButton);
@@ -516,11 +517,10 @@
+ initialFocusedElt.focus();
+ }
+ }
-+#ifndef XP_MACOSX
-+ else if (focusedElt.hasAttribute("dlgtype") && focusedElt != defaultButton) {
++ else if (AppConstants.platform != "macosx" &&
++ focusedElt.hasAttribute("dlgtype") && focusedElt != defaultButton) {
+ defaultButton.focus();
+ }
-+#endif
+ }
+ }
+
@@ -637,13 +637,14 @@
+ for (dlgtype in buttons)
+ buttons[dlgtype].hidden = !shown[dlgtype];
+
-+#ifdef XP_WIN
-+# show the spacer on Windows only when the extra2 button is present
-+ var spacer = document.getAnonymousElementByAttribute(this, "anonid", "spacer");
-+ spacer.removeAttribute("hidden");
-+ spacer.setAttribute("flex", shown["extra2"]?"1":"0");
-+#endif
-+
++ let { AppConstants } =
++ Components.utils.import("resource://gre/modules/AppConstants.jsm", {});
++ // show the spacer on Windows only when the extra2 button is present
++ if (AppConstants.platform == "win") {
++ var spacer = document.getAnonymousElementByAttribute(this, "anonid", "spacer");
++ spacer.removeAttribute("hidden");
++ spacer.setAttribute("flex", shown["extra2"]?"1":"0");
++ }
+ }
+ ]]>
+ </body>
@@ -781,7 +782,7 @@
new file mode 100644
--- /dev/null
+++ b/toolkit/content/widgets/preferences-kde.xml
-@@ -0,0 +1,1403 @@
+@@ -0,0 +1,1406 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE bindings [
@@ -1415,19 +1416,22 @@
+ var acceptButton = docElt.getButton("accept");
+ acceptButton.hidden = true;
+ var cancelButton = docElt.getButton("cancel");
-+#ifdef XP_MACOSX
-+ // no buttons on Mac except Help
-+ cancelButton.hidden = true;
-+ // Move Help button to the end
-+ document.getAnonymousElementByAttribute(this, "anonid", "spacer").hidden = true;
-+ // Also, don't fire onDialogAccept on enter
-+ acceptButton.disabled = true;
-+#else
-+ // morph the Cancel button into the Close button
-+ cancelButton.setAttribute ("icon", "close");
-+ cancelButton.label = docElt.getAttribute("closebuttonlabel");
-+ cancelButton.accesskey = docElt.getAttribute("closebuttonaccesskey");
-+#endif
++
++ let { AppConstants } =
++ Components.utils.import("resource://gre/modules/AppConstants.jsm", {});
++ if (AppConstants.platform == "macosx") {
++ // no buttons on Mac except Help
++ cancelButton.hidden = true;
++ // Move Help button to the end
++ document.getAnonymousElementByAttribute(this, "anonid", "spacer").hidden = true;
++ // Also, don't fire onDialogAccept on enter
++ acceptButton.disabled = true;
++ } else {
++ // morph the Cancel button into the Close button
++ cancelButton.setAttribute ("icon", "close");
++ cancelButton.label = docElt.getAttribute("closebuttonlabel");
++ cancelButton.accesskey = docElt.getAttribute("closebuttonaccesskey");
++ }
+ }
+ }
+ this.setAttribute("animated", this._shouldAnimate ? "true" : "false");
@@ -1597,11 +1601,13 @@
+ <parameter name="aPaneElement"/>
+ <body>
+ <![CDATA[
-+#ifdef XP_MACOSX
-+ var paneTitle = aPaneElement.label;
-+ if (paneTitle != "")
-+ document.title = paneTitle;
-+#endif
++ let { AppConstants } =
++ Components.utils.import("resource://gre/modules/AppConstants.jsm", {});
++ if (AppConstants.platform == "macosx") {
++ var paneTitle = aPaneElement.label;
++ if (paneTitle != "")
++ document.title = paneTitle;
++ }
+ var helpButton = document.documentElement.getButton("help");
+ if (aPaneElement.helpTopic)
+ helpButton.hidden = false;
@@ -1671,13 +1677,11 @@
+ <property name="_shouldAnimate">
+ <getter>
+ <![CDATA[
++ let { AppConstants } =
++ Components.utils.import("resource://gre/modules/AppConstants.jsm", {});
+ var psvc = Components.classes["@mozilla.org/preferences-service;1"]
+ .getService(Components.interfaces.nsIPrefBranch);
-+#ifdef XP_MACOSX
-+ var animate = true;
-+#else
-+ var animate = false;
-+#endif
++ var animate = AppConstants.platform == "macosx";
+ try {
+ animate = psvc.getBoolPref("browser.preferences.animateFadeIn");
+ }
@@ -3683,7 +3687,7 @@
diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
--- a/xpcom/io/nsLocalFileUnix.cpp
+++ b/xpcom/io/nsLocalFileUnix.cpp
-@@ -47,16 +47,17 @@
+@@ -44,16 +44,17 @@
#include "prproces.h"
#include "nsIDirectoryEnumerator.h"
#include "nsISimpleEnumerator.h"
@@ -3701,7 +3705,7 @@
#include "prmem.h"
#include "plbase64.h"
-@@ -1963,42 +1964,52 @@ nsLocalFile::SetPersistentDescriptor(con
+@@ -1948,42 +1949,52 @@ nsLocalFile::SetPersistentDescriptor(con
return InitWithNativePath(aPersistentDescriptor);
#endif
}
@@ -3760,7 +3764,7 @@
return rv;
}
return NS_ERROR_FAILURE;
-@@ -2006,16 +2017,22 @@ nsLocalFile::Reveal()
+@@ -1991,16 +2002,22 @@ nsLocalFile::Reveal()
return NS_ERROR_FAILURE;
#endif
}