summaryrefslogtreecommitdiff
path: root/firefox-gtk3-20.patch
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2016-03-15 14:50:37 +0100
committerMartin Stransky <stransky@redhat.com>2016-03-15 14:50:37 +0100
commitefb95e015fdc45da9b6a25e5f0b54f799d5026b9 (patch)
tree5f2bc3dcbb97248358ad0cbda4404c8dc3bd21b1 /firefox-gtk3-20.patch
parentRemoved unused patch (diff)
downloadlibrewolf-fedora-ff-efb95e015fdc45da9b6a25e5f0b54f799d5026b9.tar.gz
librewolf-fedora-ff-efb95e015fdc45da9b6a25e5f0b54f799d5026b9.tar.bz2
librewolf-fedora-ff-efb95e015fdc45da9b6a25e5f0b54f799d5026b9.zip
Updated gtk3.20 patch
Diffstat (limited to 'firefox-gtk3-20.patch')
-rw-r--r--firefox-gtk3-20.patch1138
1 files changed, 969 insertions, 169 deletions
diff --git a/firefox-gtk3-20.patch b/firefox-gtk3-20.patch
index cd7d3d4..91d4468 100644
--- a/firefox-gtk3-20.patch
+++ b/firefox-gtk3-20.patch
@@ -1,57 +1,133 @@
-diff -up firefox-43.0.4/widget/gtk/gtk3drawing.c.gtk3-20 firefox-43.0.4/widget/gtk/gtk3drawing.c
---- firefox-43.0.4/widget/gtk/gtk3drawing.c.gtk3-20 2016-01-06 01:44:12.000000000 +0100
-+++ firefox-43.0.4/widget/gtk/gtk3drawing.c 2016-01-14 11:00:53.687929988 +0100
-@@ -17,15 +17,36 @@
+diff -up firefox-45.0/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0/widget/gtk/gtk3drawing.c
+--- firefox-45.0/widget/gtk/gtk3drawing.c.gtk3-20 2016-03-03 22:48:07.000000000 +0100
++++ firefox-45.0/widget/gtk/gtk3drawing.c 2016-03-15 14:49:49.567688010 +0100
+@@ -17,32 +17,78 @@
#include <math.h>
-+typedef struct {
-+ GtkWidget* widget;
-+ GtkStyleContext* styleScrollbar;
-+ GtkStyleContext* styleTrough;
-+ GtkStyleContext* styleSlider;
-+} GtkWidgetScrollbar;
++#define MOZ_WIDGET_STYLES 4
+
+typedef struct {
-+ GtkWidget* widget;
-+ GtkStyleContext* styleButton;
-+ GtkStyleContext* styleCheck;
-+ GtkStyleContext* styleLabel;
-+} GtkWidgetToogleBox;
++ GtkWidget* widget;
+
-+typedef struct {
-+ GtkWidget* widget;
-+ GtkStyleContext* styleProgressBar;
-+ GtkStyleContext* styleTrough;
-+ GtkStyleContext* styleProgress;
-+} GtkWidgetProgressBar;
++ union {
++ struct {
++ GtkStyleContext* style;
++ GtkStyleContext* styleSelection;
++ } entry;
++
++ struct {
++ GtkStyleContext* style;
++ } button;
++
++ struct {
++ GtkStyleContext* style;
++ GtkStyleContext* styleTrough;
++ GtkStyleContext* styleSlider;
++ } scroll;
++
++ struct {
++ GtkStyleContext* style;
++ GtkStyleContext* styleCheck;
++ GtkStyleContext* styleLabel;
++ } check;
++
++ struct {
++ GtkStyleContext* style;
++ GtkStyleContext* styleTrough;
++ GtkStyleContext* styleProgress;
++ } progress;
++
++ struct {
++ GtkStyleContext* style;
++ GtkStyleContext* styleEntry;
++ GtkStyleContext* styleButtonUp;
++ GtkStyleContext* styleButtonDown;
++ } spin;
++
++ struct {
++ GtkStyleContext* style[MOZ_WIDGET_STYLES];
++ } all;
++ };
++} MozGtkWidget;
+
static GtkWidget* gProtoWindow;
static GtkWidget* gProtoLayout;
- static GtkWidget* gButtonWidget;
+-static GtkWidget* gButtonWidget;
++static MozGtkWidget gButton;
static GtkWidget* gToggleButtonWidget;
static GtkWidget* gButtonArrowWidget;
-static GtkWidget* gCheckboxWidget;
-static GtkWidget* gRadiobuttonWidget;
-static GtkWidget* gHorizScrollbarWidget;
-static GtkWidget* gVertScrollbarWidget;
-+static GtkWidgetToogleBox gCheckbox;
-+static GtkWidgetToogleBox gRadiobutton;
-+static GtkWidgetScrollbar gVertScrollbar;
-+static GtkWidgetScrollbar gHorizScrollbar;
- static GtkWidget* gSpinWidget;
+-static GtkWidget* gSpinWidget;
++static MozGtkWidget gCheckbox;
++static MozGtkWidget gRadiobutton;
++static MozGtkWidget gVertScrollbar;
++static MozGtkWidget gHorizScrollbar;
++static MozGtkWidget gSpin;
static GtkWidget* gHScaleWidget;
static GtkWidget* gVScaleWidget;
-@@ -42,7 +63,7 @@ static GtkWidget* gHandleBoxWidget;
+-static GtkWidget* gEntryWidget;
++static MozGtkWidget gEntry;
+ static GtkWidget* gComboBoxWidget;
+ static GtkWidget* gComboBoxButtonWidget;
+ static GtkWidget* gComboBoxArrowWidget;
+ static GtkWidget* gComboBoxSeparatorWidget;
+ static GtkWidget* gComboBoxEntryWidget;
+-static GtkWidget* gComboBoxEntryTextareaWidget;
++static MozGtkWidget gComboBoxEntryTextarea;
+ static GtkWidget* gComboBoxEntryButtonWidget;
+ static GtkWidget* gComboBoxEntryArrowWidget;
+ static GtkWidget* gHandleBoxWidget;
static GtkWidget* gToolbarWidget;
static GtkWidget* gFrameWidget;
static GtkWidget* gStatusbarWidget;
-static GtkWidget* gProgressWidget;
-+static GtkWidgetProgressBar gProgressBar;
++static MozGtkWidget gProgressBar;
static GtkWidget* gTabWidget;
static GtkWidget* gTooltipWidget;
static GtkWidget* gMenuBarWidget;
-@@ -97,6 +118,33 @@ GetStateFlagsFromGtkWidgetState(GtkWidge
+@@ -78,6 +124,37 @@ static gboolean is_initialized;
+ #define GTK_STATE_FLAG_CHECKED (1 << 11)
+ #endif
+
++void moz_gtk_widget_free(MozGtkWidget *aMozWidget)
++{
++ // This was removed as a child of gProtoWindow
++ if (aMozWidget->widget) {
++ aMozWidget->widget = NULL;
++ }
++
++ for(int i = 0; i < MOZ_WIDGET_STYLES; i++) {
++ if (aMozWidget->all.style[i]) {
++ g_object_unref(aMozWidget->all.style[i]);
++ aMozWidget->all.style[i] = NULL;
++ }
++ }
++}
++
++// TODO - weak dep!! (dlsym)
++#if GTK_CHECK_VERSION(3, 19, 2)
++#define moz_gtk_path_set_class_name gtk_widget_path_iter_set_object_name
++#else
++#define moz_gtk_path_set_class_name gtk_widget_path_iter_add_class
++#endif
++//gtk_widget_path_iter_get_state
++
++static void
++moz_gtk_get_style_border(GtkStyleContext* style, GtkStateFlags state_flags,
++ GtkBorder *border);
++
++static void
++moz_gtk_get_style_padding(GtkStyleContext* style, GtkStateFlags state_flags,
++ GtkBorder *padding);
++
+ static GtkStateFlags
+ GetStateFlagsFromGtkWidgetState(GtkWidgetState* state)
+ {
+@@ -97,6 +174,41 @@ GetStateFlagsFromGtkWidgetState(GtkWidge
return stateFlags;
}
@@ -68,15 +144,23 @@ diff -up firefox-43.0.4/widget/gtk/gtk3drawing.c.gtk3-20 firefox-43.0.4/widget/g
+
+ gtk_widget_path_append_type (path, node->type);
+ if (node->name)
-+ gtk_widget_path_iter_set_object_name (path, -1, node->name);
++ moz_gtk_path_set_class_name(path, -1, node->name);
+ if (node->class1)
-+ gtk_widget_path_iter_add_class (path, -1, node->class1);
++ gtk_widget_path_iter_add_class(path, -1, node->class1);
+ if (node->class2)
-+ gtk_widget_path_iter_add_class (path, -1, node->class2);
++ gtk_widget_path_iter_add_class(path, -1, node->class2);
+
+ context = gtk_style_context_new ();
+ gtk_style_context_set_path (context, path);
+ gtk_style_context_set_parent (context, parent);
++
++ if(!gtk_check_version(3, 14, 0)) {
++ /* Unfortunately, we have to explicitly set the state again here
++ * for it to take effect
++ */
++ gtk_style_context_set_state (context, gtk_widget_path_iter_get_state (path, -1));
++ }
++
+ gtk_widget_path_unref (path);
+
+ return context;
@@ -85,7 +169,27 @@ diff -up firefox-43.0.4/widget/gtk/gtk3drawing.c.gtk3-20 firefox-43.0.4/widget/g
/* Because we have such an unconventional way of drawing widgets, signal to the GTK theme engine
that they are drawing for Mozilla instead of a conventional GTK app so they can do any specific
things they may want to do. */
-@@ -195,9 +243,21 @@ ensure_button_arrow_widget()
+@@ -141,9 +253,16 @@ setup_widget_prototype(GtkWidget* widget
+ static gint
+ ensure_button_widget()
+ {
+- if (!gButtonWidget) {
+- gButtonWidget = gtk_button_new_with_label("M");
+- setup_widget_prototype(gButtonWidget);
++ if (!gButton.widget) {
++ GtkCssNode path[] = {
++ { GTK_TYPE_BUTTON, "button", NULL, NULL }
++ };
++
++ gButton.widget = gtk_button_new_with_label("M");
++ setup_widget_prototype(gButton.widget);
++ gtk_widget_show(gButton.widget);
++
++ gButton.button.style = moz_gtk_style_create(&path[0], NULL);
+ }
+ return MOZ_GTK_SUCCESS;
+ }
+@@ -195,9 +314,21 @@ ensure_button_arrow_widget()
static gint
ensure_checkbox_widget()
{
@@ -94,23 +198,23 @@ diff -up firefox-43.0.4/widget/gtk/gtk3drawing.c.gtk3-20 firefox-43.0.4/widget/g
- setup_widget_prototype(gCheckboxWidget);
+ if (!gCheckbox.widget) {
+ GtkCssNode path[] = {
-+ { GTK_TYPE_LABEL, "checkbutton", NULL, NULL },
-+ { G_TYPE_NONE, "check", NULL, NULL },
-+ { G_TYPE_NONE, "label", NULL, NULL }
++ { GTK_TYPE_TOGGLE_BUTTON, "checkbutton", NULL, NULL },
++ { G_TYPE_NONE, "check", NULL, NULL },
++ { G_TYPE_NONE, "label", NULL, NULL }
+ };
+
+ gCheckbox.widget = gtk_check_button_new_with_label("M");
+ setup_widget_prototype(gCheckbox.widget);
+
-+ gCheckbox.styleButton = moz_gtk_style_create(&path[0], NULL);
-+ gCheckbox.styleCheck = moz_gtk_style_create(&path[1],
-+ gCheckbox.styleButton);
-+ gCheckbox.styleLabel = moz_gtk_style_create(&path[2],
-+ gCheckbox.styleButton);
++ gCheckbox.check.style = moz_gtk_style_create(&path[0], NULL);
++ gCheckbox.check.styleCheck = moz_gtk_style_create(&path[1],
++ gCheckbox.check.style);
++ gCheckbox.check.styleLabel = moz_gtk_style_create(&path[2],
++ gCheckbox.check.style);
}
return MOZ_GTK_SUCCESS;
}
-@@ -205,9 +265,21 @@ ensure_checkbox_widget()
+@@ -205,9 +336,21 @@ ensure_checkbox_widget()
static gint
ensure_radiobutton_widget()
{
@@ -119,23 +223,23 @@ diff -up firefox-43.0.4/widget/gtk/gtk3drawing.c.gtk3-20 firefox-43.0.4/widget/g
- setup_widget_prototype(gRadiobuttonWidget);
+ if (!gRadiobutton.widget) {
+ GtkCssNode path[] = {
-+ { GTK_TYPE_LABEL, "radiobutton", NULL, NULL },
-+ { G_TYPE_NONE, "radio", NULL, NULL },
-+ { G_TYPE_NONE, "label", NULL, NULL }
++ { GTK_TYPE_TOGGLE_BUTTON, "radiobutton", NULL, NULL },
++ { G_TYPE_NONE, "radio", NULL, NULL },
++ { G_TYPE_NONE, "label", NULL, NULL }
+ };
+
+ gRadiobutton.widget = gtk_radio_button_new_with_label(NULL, "M");
+ setup_widget_prototype(gRadiobutton.widget);
+
-+ gRadiobutton.styleButton = moz_gtk_style_create(&path[0], NULL);
-+ gRadiobutton.styleCheck = moz_gtk_style_create(&path[1],
-+ gRadiobutton.styleButton);
-+ gRadiobutton.styleLabel = moz_gtk_style_create(&path[2],
-+ gRadiobutton.styleButton);
++ gRadiobutton.check.style = moz_gtk_style_create(&path[0], NULL);
++ gRadiobutton.check.styleCheck = moz_gtk_style_create(&path[1],
++ gRadiobutton.check.style);
++ gRadiobutton.check.styleLabel = moz_gtk_style_create(&path[2],
++ gRadiobutton.check.style);
}
return MOZ_GTK_SUCCESS;
}
-@@ -215,13 +287,31 @@ ensure_radiobutton_widget()
+@@ -215,13 +358,31 @@ ensure_radiobutton_widget()
static gint
ensure_scrollbar_widget()
{
@@ -150,31 +254,117 @@ diff -up firefox-43.0.4/widget/gtk/gtk3drawing.c.gtk3-20 firefox-43.0.4/widget/g
+ GtkCssNode path[] = {
+ { GTK_TYPE_SCROLLBAR, "scrollbar", "horizontal", NULL },
+ { GTK_TYPE_SCROLLBAR, "scrollbar", "vertical", NULL },
-+ { G_TYPE_NONE, "trough", NULL, NULL },
-+ { G_TYPE_NONE, "slider", NULL, NULL }
++ { GTK_TYPE_SCROLLBAR, "trough", NULL, NULL },
++ { GTK_TYPE_SCROLLBAR, "slider", NULL, NULL }
+ };
+
+ gVertScrollbar.widget = gtk_scrollbar_new(GTK_ORIENTATION_VERTICAL, NULL);
+ setup_widget_prototype(gVertScrollbar.widget);
+
-+ gVertScrollbar.styleScrollbar = moz_gtk_style_create(path+1, NULL);
-+ gVertScrollbar.styleTrough = moz_gtk_style_create(path+2,
-+ gVertScrollbar.styleScrollbar);
-+ gVertScrollbar.styleSlider = moz_gtk_style_create(path+3,
-+ gVertScrollbar.styleTrough);
++ gVertScrollbar.scroll.style = moz_gtk_style_create(path+1, NULL);
++ gVertScrollbar.scroll.styleTrough = moz_gtk_style_create(path+2,
++ gVertScrollbar.scroll.style);
++ gVertScrollbar.scroll.styleSlider = moz_gtk_style_create(path+3,
++ gVertScrollbar.scroll.styleTrough);
+
+ gHorizScrollbar.widget = gtk_scrollbar_new(GTK_ORIENTATION_HORIZONTAL, NULL);
+ setup_widget_prototype(gHorizScrollbar.widget);
+
-+ gHorizScrollbar.styleScrollbar = moz_gtk_style_create(path, NULL);
-+ gHorizScrollbar.styleTrough = moz_gtk_style_create(path+2,
-+ gHorizScrollbar.styleScrollbar);
-+ gHorizScrollbar.styleSlider = moz_gtk_style_create(path+3,
-+ gHorizScrollbar.styleTrough);
++ gHorizScrollbar.scroll.style = moz_gtk_style_create(path, NULL);
++ gHorizScrollbar.scroll.styleTrough = moz_gtk_style_create(path+2,
++ gHorizScrollbar.scroll.style);
++ gHorizScrollbar.scroll.styleSlider = moz_gtk_style_create(path+3,
++ gHorizScrollbar.scroll.styleTrough);
}
return MOZ_GTK_SUCCESS;
}
-@@ -528,9 +618,21 @@ ensure_tab_widget()
+@@ -229,11 +390,24 @@ ensure_scrollbar_widget()
+ static gint
+ ensure_spin_widget()
+ {
+- if (!gSpinWidget) {
+- gSpinWidget = gtk_spin_button_new(NULL, 1, 0);
+- setup_widget_prototype(gSpinWidget);
+- }
+- return MOZ_GTK_SUCCESS;
++ if (!gSpin.widget) {
++ GtkCssNode path[] = {
++ { GTK_TYPE_SPIN_BUTTON, "spinbutton", "horizontal", NULL },
++ { GTK_TYPE_SPIN_BUTTON, "spinbutton", "vertical", NULL },
++ { GTK_TYPE_ENTRY, "entry", NULL, NULL },
++ { G_TYPE_NONE, "button", "up", NULL },
++ { G_TYPE_NONE, "button", "down", NULL }
++ };
++
++ gSpin.widget = gtk_spin_button_new(NULL, 1, 0);
++ setup_widget_prototype(gSpin.widget);
++
++ gSpin.spin.style = moz_gtk_style_create(path, NULL);
++ gSpin.spin.styleButtonUp = moz_gtk_style_create(path+3, gSpin.spin.style);
++ gSpin.spin.styleButtonDown = moz_gtk_style_create(path+4, gSpin.spin.style);
++ gSpin.spin.styleEntry = moz_gtk_style_create(path+2, gSpin.spin.style);
++ }
++ return MOZ_GTK_SUCCESS;
+ }
+
+ static gint
+@@ -253,9 +427,19 @@ ensure_scale_widget()
+ static gint
+ ensure_entry_widget()
+ {
+- if (!gEntryWidget) {
+- gEntryWidget = gtk_entry_new();
+- setup_widget_prototype(gEntryWidget);
++ if (!gEntry.widget) {
++ GtkCssNode path[] = {
++ { GTK_TYPE_ENTRY, "entry", NULL, NULL },
++ { G_TYPE_NONE, "selection", NULL, NULL }
++ };
++
++ gEntry.widget = gtk_entry_new();
++ setup_widget_prototype(gEntry.widget);
++ gtk_widget_show(gEntry.widget);
++
++ gEntry.entry.style = moz_gtk_style_create(&path[0], NULL);
++ gEntry.entry.styleSelection = moz_gtk_style_create(&path[1],
++ gEntry.entry.style);
+ }
+ return MOZ_GTK_SUCCESS;
+ }
+@@ -387,9 +571,9 @@ moz_gtk_get_combo_box_entry_inner_widget
+ g_object_add_weak_pointer(G_OBJECT(widget),
+ (gpointer) &gComboBoxEntryButtonWidget);
+ } else if (GTK_IS_ENTRY(widget)) {
+- gComboBoxEntryTextareaWidget = widget;
++ gComboBoxEntryTextarea.widget = widget;
+ g_object_add_weak_pointer(G_OBJECT(widget),
+- (gpointer) &gComboBoxEntryTextareaWidget);
++ (gpointer) &gComboBoxEntryTextarea.widget);
+ } else
+ return;
+ gtk_widget_realize(widget);
+@@ -411,7 +595,7 @@ ensure_combo_box_entry_widgets()
+ {
+ GtkWidget* buttonChild;
+
+- if (gComboBoxEntryTextareaWidget &&
++ if (gComboBoxEntryTextarea.widget &&
+ gComboBoxEntryButtonWidget &&
+ gComboBoxEntryArrowWidget)
+ return MOZ_GTK_SUCCESS;
+@@ -427,9 +611,9 @@ ensure_combo_box_entry_widgets()
+ moz_gtk_get_combo_box_entry_inner_widgets,
+ NULL);
+
+- if (!gComboBoxEntryTextareaWidget) {
++ if (!gComboBoxEntryTextarea.widget) {
+ ensure_entry_widget();
+- gComboBoxEntryTextareaWidget = gEntryWidget;
++ gComboBoxEntryTextarea.widget = gEntry.widget;
+ }
+
+ if (gComboBoxEntryButtonWidget) {
+@@ -528,9 +712,21 @@ ensure_tab_widget()
static gint
ensure_progress_widget()
{
@@ -183,23 +373,35 @@ diff -up firefox-43.0.4/widget/gtk/gtk3drawing.c.gtk3-20 firefox-43.0.4/widget/g
- setup_widget_prototype(gProgressWidget);
+ if (!gProgressBar.widget) {
+ GtkCssNode path[] = {
-+ { GTK_TYPE_LABEL, "progressbar", NULL, NULL },
-+ { G_TYPE_NONE, "trough", NULL, NULL },
-+ { G_TYPE_NONE, "progress", NULL, NULL },
++ { GTK_TYPE_LABEL, "progressbar", NULL, NULL },
++ { G_TYPE_NONE, "trough", NULL, NULL },
++ { G_TYPE_NONE, "progress", NULL, NULL },
+ };
+
+ gProgressBar.widget = gtk_progress_bar_new();
+ setup_widget_prototype(gProgressBar.widget);
+
-+ gProgressBar.styleProgressBar = moz_gtk_style_create(&path[0], NULL);
-+ gProgressBar.styleTrough = moz_gtk_style_create(&path[1],
-+ gProgressBar.styleProgressBar);
-+ gProgressBar.styleProgress = moz_gtk_style_create(&path[2],
-+ gProgressBar.styleTrough);
++ gProgressBar.progress.style = moz_gtk_style_create(&path[0], NULL);
++ gProgressBar.progress.styleTrough = moz_gtk_style_create(&path[1],
++ gProgressBar.progress.style);
++ gProgressBar.progress.styleProgress = moz_gtk_style_create(&path[2],
++ gProgressBar.progress.styleTrough);
}
return MOZ_GTK_SUCCESS;
}
-@@ -757,7 +859,7 @@ moz_gtk_checkbox_get_metrics(gint* indic
+@@ -636,6 +832,11 @@ static gint
+ ensure_check_menu_item_widget()
+ {
+ if (!gCheckMenuItemWidget) {
++ GtkCssNode path[] = {
++ { GTK_TYPE_CHECK_MENU_ITEM, "menuitem", NULL, NULL },
++ { G_TYPE_NONE, "check", NULL, NULL }
++ };
++
+ ensure_menu_popup_widget();
+ gCheckMenuItemWidget = gtk_check_menu_item_new_with_label("M");
+ gtk_menu_shell_append(GTK_MENU_SHELL(gMenuPopupWidget),
+@@ -757,7 +958,7 @@ moz_gtk_checkbox_get_metrics(gint* indic
{
ensure_checkbox_widget();
@@ -208,7 +410,7 @@ diff -up firefox-43.0.4/widget/gtk/gtk3drawing.c.gtk3-20 firefox-43.0.4/widget/g
"indicator_size", indicator_size,
"indicator_spacing", indicator_spacing,
NULL);
-@@ -770,7 +872,7 @@ moz_gtk_radio_get_metrics(gint* indicato
+@@ -770,7 +971,7 @@ moz_gtk_radio_get_metrics(gint* indicato
{
ensure_radiobutton_widget();
@@ -217,13 +419,57 @@ diff -up firefox-43.0.4/widget/gtk/gtk3drawing.c.gtk3-20 firefox-43.0.4/widget/g
"indicator_size", indicator_size,
"indicator_spacing", indicator_spacing,
NULL);
-@@ -961,15 +1063,14 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec
+@@ -783,13 +984,12 @@ moz_gtk_get_focus_outline_size(gint* foc
+ {
+ GtkBorder border;
+ GtkBorder padding;
+- GtkStyleContext *style;
++ GtkStyleContext* style = gEntry.entry.style;
+
+ ensure_entry_widget();
+- style = gtk_widget_get_style_context(gEntryWidget);
+
+- gtk_style_context_get_border(style, 0, &border);
+- gtk_style_context_get_padding(style, 0, &padding);
++ gtk_style_context_get_border(style, gtk_style_context_get_state(style), &border);
++ gtk_style_context_get_padding(style, gtk_style_context_get_state(style), &padding);
+ *focus_h_width = border.left + padding.left;
+ *focus_v_width = border.top + padding.top;
+ return MOZ_GTK_SUCCESS;
+@@ -826,7 +1026,7 @@ moz_gtk_button_get_default_overflow(gint
+ GtkBorder* default_outside_border;
+
+ ensure_button_widget();
+- gtk_widget_style_get(gButtonWidget,
++ gtk_widget_style_get(gButton.widget,
+ "default-outside-border", &default_outside_border,
+ NULL);
+
+@@ -849,7 +1049,7 @@ moz_gtk_button_get_default_border(gint*
+ GtkBorder* default_border;
+
+ ensure_button_widget();
+- gtk_widget_style_get(gButtonWidget,
++ gtk_widget_style_get(gButton.widget,
+ "default-border", &default_border,
+ NULL);
+
+@@ -940,7 +1140,7 @@ moz_gtk_button_paint(cairo_t *cr, GdkRec
+
+ if (state->focused) {
+ GtkBorder border;
+- gtk_style_context_get_border(style, state_flags, &border);
++ moz_gtk_get_style_border(style, state_flags, &border);
+ x += border.left;
+ y += border.top;
+ width -= (border.left + border.right);
+@@ -961,15 +1161,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;
- GtkWidget *w;
- GtkStyleContext *style;
-+ GtkWidgetToogleBox *w;
++ MozGtkWidget *w;
if (isradio) {
moz_gtk_radio_get_metrics(&indicator_size, &indicator_spacing);
@@ -236,7 +482,7 @@ diff -up firefox-43.0.4/widget/gtk/gtk3drawing.c.gtk3-20 firefox-43.0.4/widget/g
}
// XXX we should assert rect->height >= indicator_size too
-@@ -988,11 +1089,9 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec
+@@ -988,11 +1187,9 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec
focus_width = width + 2 * indicator_spacing;
focus_height = height + 2 * indicator_spacing;
@@ -247,48 +493,62 @@ diff -up firefox-43.0.4/widget/gtk/gtk3drawing.c.gtk3-20 firefox-43.0.4/widget/g
- gtk_style_context_save(style);
+ gtk_widget_set_sensitive(w->widget, !state->disabled);
+ gtk_widget_set_direction(w->widget, direction);
-+ gtk_style_context_save(w->styleCheck);
++ gtk_style_context_save(w->check.styleCheck);
if (selected)
state_flags |= checkbox_check_state;
-@@ -1000,13 +1099,12 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec
+@@ -1000,13 +1197,15 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec
if (inconsistent)
state_flags |= GTK_STATE_FLAG_INCONSISTENT;
- gtk_style_context_set_state(style, state_flags);
-+ gtk_style_context_set_state(w->styleCheck, state_flags);
++ gtk_style_context_set_state(w->check.styleCheck, state_flags);
++
++ gtk_render_background(w->check.styleCheck, cr, x, y, width, height);
++ gtk_render_frame(w->check.styleCheck, cr, x, y, width, height);
if (isradio) {
- gtk_style_context_add_class(style, GTK_STYLE_CLASS_RADIO);
- gtk_render_option(style, cr, x, y, width, height);
-+ gtk_render_option(w->styleCheck, cr, x, y, width, height);
++ gtk_render_option(w->check.styleCheck, cr, x, y, width, height);
if (state->focused) {
- gtk_render_focus(style, cr, focus_x, focus_y,
-+ gtk_render_focus(w->styleCheck, cr, focus_x, focus_y,
++ gtk_render_focus(w->check.styleCheck, cr, focus_x, focus_y,
focus_width, focus_height);
}
}
-@@ -1015,15 +1113,14 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec
+@@ -1015,15 +1214,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.
*/
- gtk_style_context_add_class(style, GTK_STYLE_CLASS_CHECK);
- gtk_toggle_button_set_inconsistent(GTK_TOGGLE_BUTTON(gCheckboxWidget), inconsistent);
- gtk_render_check(style, cr, x, y, width, height);
-+ gtk_toggle_button_set_inconsistent(GTK_TOGGLE_BUTTON(gCheckbox.widget), inconsistent);
-+ gtk_render_check(w->styleCheck, cr, x, y, width, height);
++ gtk_toggle_button_set_inconsistent(GTK_TOGGLE_BUTTON(w->widget), inconsistent);
++ gtk_render_check(w->check.styleCheck, cr, x, y, width, height);
if (state->focused) {
- gtk_render_focus(style, cr,
-+ gtk_render_focus(w->styleCheck, cr,
++ gtk_render_focus(w->check.styleCheck, cr,
focus_x, focus_y, focus_width, focus_height);
}
}
- gtk_style_context_restore(style);
-+ gtk_style_context_restore(w->styleCheck);
++ gtk_style_context_restore(w->check.styleCheck);
return MOZ_GTK_SUCCESS;
}
-@@ -1109,9 +1206,9 @@ moz_gtk_scrollbar_button_paint(cairo_t *
+@@ -1040,8 +1238,8 @@ calculate_button_inner_rect(GtkWidget* b
+ style = gtk_widget_get_style_context(button);
+
+ /* This mirrors gtkbutton's child positioning */
+- gtk_style_context_get_border(style, 0, &border);
+- gtk_style_context_get_padding(style, 0, &padding);
++ gtk_style_context_get_border(style, gtk_style_context_get_state(style), &border);
++ gtk_style_context_get_padding(style, gtk_style_context_get_state(style), &padding);
+
+ inner_rect->x = rect->x + border.left + padding.left;
+ inner_rect->y = rect->y + padding.top + border.top;
+@@ -1107,9 +1305,9 @@ moz_gtk_scrollbar_button_paint(cairo_t *
ensure_scrollbar_widget();
if (flags & MOZ_GTK_STEPPER_VERTICAL)
@@ -300,12 +560,12 @@ diff -up firefox-43.0.4/widget/gtk/gtk3drawing.c.gtk3-20 firefox-43.0.4/widget/g
gtk_widget_set_direction(scrollbar, direction);
-@@ -1177,26 +1274,22 @@ moz_gtk_scrollbar_trough_paint(GtkThemeW
+@@ -1175,26 +1373,23 @@ moz_gtk_scrollbar_trough_paint(GtkThemeW
GtkTextDirection direction)
{
GtkStyleContext* style;
- GtkScrollbar *scrollbar;
--
+
ensure_scrollbar_widget();
- if (widget == MOZ_GTK_SCROLLBAR_TRACK_HORIZONTAL)
@@ -314,13 +574,13 @@ diff -up firefox-43.0.4/widget/gtk/gtk3drawing.c.gtk3-20 firefox-43.0.4/widget/g
- scrollbar = GTK_SCROLLBAR(gVertScrollbarWidget);
-
- gtk_widget_set_direction(GTK_WIDGET(scrollbar), direction);
-+ if (widget == MOZ_GTK_SCROLLBAR_TRACK_HORIZONTAL) {
++ if (widget == MOZ_GTK_SCROLLBAR_TRACK_HORIZONTAL) {
+ gtk_widget_set_direction(GTK_WIDGET(gHorizScrollbar.widget), direction);
-+ style = gHorizScrollbar.styleTrough;
-+ }
++ style = gHorizScrollbar.scroll.styleTrough;
++ }
+ else {
+ gtk_widget_set_direction(GTK_WIDGET(gVertScrollbar.widget), direction);
-+ style = gVertScrollbar.styleTrough;
++ style = gVertScrollbar.scroll.styleTrough;
+ }
if (flags & MOZ_GTK_TRACK_OPAQUE) {
@@ -335,7 +595,7 @@ diff -up firefox-43.0.4/widget/gtk/gtk3drawing.c.gtk3-20 firefox-43.0.4/widget/g
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);
-@@ -1204,7 +1297,6 @@ moz_gtk_scrollbar_trough_paint(GtkThemeW
+@@ -1202,7 +1397,6 @@ moz_gtk_scrollbar_trough_paint(GtkThemeW
gtk_render_focus(style, cr,
rect->x, rect->y, rect->width, rect->height);
}
@@ -343,7 +603,13 @@ diff -up firefox-43.0.4/widget/gtk/gtk3drawing.c.gtk3-20 firefox-43.0.4/widget/g
return MOZ_GTK_SUCCESS;
}
-@@ -1222,19 +1314,16 @@ moz_gtk_scrollbar_thumb_paint(GtkThemeWi
+@@ -1214,25 +1408,21 @@ moz_gtk_scrollbar_thumb_paint(GtkThemeWi
+ {
+ GtkStateFlags state_flags = GetStateFlagsFromGtkWidgetState(state);
+ GtkStyleContext* style;
+- GtkScrollbar *scrollbar;
+ GtkAdjustment *adj;
+ GtkBorder margin;
ensure_scrollbar_widget();
@@ -357,11 +623,11 @@ diff -up firefox-43.0.4/widget/gtk/gtk3drawing.c.gtk3-20 firefox-43.0.4/widget/g
- style = gtk_widget_get_style_context(GTK_WIDGET(scrollbar));
- gtk_style_context_save(style);
+ if (widget == MOZ_GTK_SCROLLBAR_THUMB_HORIZONTAL) {
-+ style = gHorizScrollbar.styleSlider;
++ style = gHorizScrollbar.scroll.styleSlider;
+ gtk_widget_set_direction(GTK_WIDGET(gHorizScrollbar.widget), direction);
+ }
+ else {
-+ style = gVertScrollbar.styleSlider;
++ style = gVertScrollbar.scroll.styleSlider;
+ gtk_widget_set_direction(GTK_WIDGET(gVertScrollbar.widget), direction);
+ }
@@ -371,7 +637,7 @@ diff -up firefox-43.0.4/widget/gtk/gtk3drawing.c.gtk3-20 firefox-43.0.4/widget/g
gtk_style_context_get_margin (style, state_flags, &margin);
gtk_render_slider(style, cr,
-@@ -1245,8 +1334,6 @@ moz_gtk_scrollbar_thumb_paint(GtkThemeWi
+@@ -1243,8 +1433,6 @@ moz_gtk_scrollbar_thumb_paint(GtkThemeWi
(widget == MOZ_GTK_SCROLLBAR_THUMB_HORIZONTAL) ?
GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL);
@@ -380,13 +646,87 @@ diff -up firefox-43.0.4/widget/gtk/gtk3drawing.c.gtk3-20 firefox-43.0.4/widget/g
return MOZ_GTK_SUCCESS;
}
-@@ -1801,29 +1888,27 @@ moz_gtk_container_paint(cairo_t *cr, Gdk
+@@ -1255,8 +1443,8 @@ moz_gtk_spin_paint(cairo_t *cr, GdkRecta
+ GtkStyleContext* style;
+
+ ensure_spin_widget();
+- gtk_widget_set_direction(gSpinWidget, direction);
+- style = gtk_widget_get_style_context(gSpinWidget);
++ gtk_widget_set_direction(gSpin.widget, direction);
++ style = gSpin.spin.style;
+ 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 +1463,10 @@ moz_gtk_spin_updown_paint(cairo_t *cr, G
+ GtkStyleContext* style;
+
+ ensure_spin_widget();
+- style = gtk_widget_get_style_context(gSpinWidget);
++ style = gSpin.spin.style;
+ gtk_style_context_save(style);
+- gtk_style_context_add_class(style, GTK_STYLE_CLASS_SPINBUTTON);
+ gtk_style_context_set_state(style, GetStateFlagsFromGtkWidgetState(state));
+- gtk_widget_set_direction(gSpinWidget, direction);
++ gtk_widget_set_direction(gSpin.widget, direction);
+
+ 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 +1632,13 @@ moz_gtk_vpaned_paint(cairo_t *cr, GdkRec
+ static gint
+ moz_gtk_entry_paint(cairo_t *cr, GdkRectangle* rect,
+ GtkWidgetState* state,
+- GtkWidget* widget, GtkTextDirection direction)
++ MozGtkWidget* w, GtkTextDirection direction)
+ {
+ gint x = rect->x, y = rect->y, width = rect->width, height = rect->height;
+- GtkStyleContext* style;
+ int draw_focus_outline_only = state->depressed; // NS_THEME_FOCUS_OUTLINE
++ GtkStyleContext* style = w->entry.style;
+
+- gtk_widget_set_direction(widget, direction);
+-
+- style = gtk_widget_get_style_context(widget);
++ gtk_widget_set_direction(w->widget, direction);
+
+ if (draw_focus_outline_only) {
+ // Inflate the given 'rect' with the focus outline size.
+@@ -1473,10 +1658,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 */
+- gtk_widget_set_sensitive(widget, !state->disabled);
++ gtk_widget_set_sensitive(w->widget, !state->disabled);
+
+ gtk_style_context_save(style);
+- gtk_style_context_add_class(style, GTK_STYLE_CLASS_ENTRY);
+
+ /* Now paint the shadow and focus border.
+ * We do like in gtk_entry_draw_frame, we first draw the shadow, a tad
+@@ -1526,7 +1710,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);
+- gtk_style_context_get_border(style, state_flags, &border);
++ moz_gtk_get_style_border(style, state_flags, &border);
+ xthickness = border.left;
+ ythickness = border.top;
+
+@@ -1697,7 +1881,7 @@ moz_gtk_combo_box_paint(cairo_t *cr, Gdk
+ if (direction == GTK_TEXT_DIR_LTR) {
+ GtkBorder padding;
+ GtkStateFlags state_flags = GetStateFlagsFromGtkWidgetState(state);
+- gtk_style_context_get_padding(style, state_flags, &padding);
++ moz_gtk_get_style_padding(style, state_flags, &padding);
+ arrow_rect.x -= padding.left;
+ }
+ else
+@@ -1799,29 +1983,27 @@ moz_gtk_container_paint(cairo_t *cr, Gdk
gboolean isradio, GtkTextDirection direction)
{
GtkStateFlags state_flags = GetStateFlagsFromGtkWidgetState(state);
- GtkStyleContext* style;
- GtkWidget *widget;
-+ GtkWidgetToogleBox *widget;
++ MozGtkWidget *widget;
if (isradio) {
ensure_radiobutton_widget();
@@ -403,28 +743,28 @@ diff -up firefox-43.0.4/widget/gtk/gtk3drawing.c.gtk3-20 firefox-43.0.4/widget/g
- style = gtk_widget_get_style_context(widget);
- gtk_style_context_save(style);
- gtk_style_context_set_state(style, state_flags);
-+ gtk_style_context_save(widget->styleButton);
-+ gtk_style_context_set_state(widget->styleButton, state_flags);
++ gtk_style_context_save(widget->check.style);
++ gtk_style_context_set_state(widget->check.style, state_flags);
/* this is for drawing a prelight box */
if (state_flags & GTK_STATE_FLAG_PRELIGHT) {
- gtk_render_background(style, cr,
-+ gtk_render_background(widget->styleButton, cr,
++ gtk_render_background(widget->check.style, cr,
rect->x, rect->y, rect->width, rect->height);
}
- gtk_style_context_restore(style);
-+ gtk_style_context_restore(widget->styleButton);
++ gtk_style_context_restore(widget->check.style);
return MOZ_GTK_SUCCESS;
}
-@@ -1833,32 +1918,25 @@ moz_gtk_toggle_label_paint(cairo_t *cr,
+@@ -1831,32 +2013,26 @@ moz_gtk_toggle_label_paint(cairo_t *cr,
GtkWidgetState* state,
gboolean isradio, GtkTextDirection direction)
{
- GtkStyleContext *style;
- GtkWidget *widget;
-+ GtkWidgetToogleBox *widget;
++ MozGtkWidget *widget;
if (!state->focused)
return MOZ_GTK_SUCCESS;
@@ -436,30 +776,40 @@ diff -up firefox-43.0.4/widget/gtk/gtk3drawing.c.gtk3-20 firefox-43.0.4/widget/g
} else {
ensure_checkbox_widget();
- widget = gCheckboxWidget;
-+ widget = &gCheckbox;
- }
+- }
- style = gtk_widget_get_style_context(widget);
- gtk_style_context_save(style);
- if (isradio) {
- gtk_style_context_add_class(style, GTK_STYLE_CLASS_RADIO);
- } else {
- gtk_style_context_add_class(style, GTK_STYLE_CLASS_CHECK);
-- }
++ widget = &gCheckbox;
+ }
- gtk_widget_set_direction(widget, direction);
-+ gtk_style_context_save(widget->styleLabel);
++ gtk_style_context_save(widget->check.styleLabel);
+ gtk_widget_set_direction(widget->widget, direction);
- gtk_style_context_set_state(style, GetStateFlagsFromGtkWidgetState(state));
- gtk_render_focus(style, cr,
-+ gtk_style_context_set_state(widget->styleLabel, GetStateFlagsFromGtkWidgetState(state));
-+ gtk_render_focus(widget->styleLabel, cr,
++ gtk_style_context_set_state(widget->check.styleLabel,
++ GetStateFlagsFromGtkWidgetState(state));
++ gtk_render_focus(widget->check.styleLabel, cr,
rect->x, rect->y, rect->width, rect->height);
- gtk_style_context_restore(style);
-+ gtk_style_context_restore(widget->styleLabel);
++ gtk_style_context_restore(widget->check.styleLabel);
return MOZ_GTK_SUCCESS;
}
-@@ -2006,18 +2084,13 @@ static gint
+@@ -1917,7 +2093,7 @@ moz_gtk_toolbar_separator_paint(cairo_t
+ rect->height * (end_fraction - start_fraction));
+ } else {
+ GtkBorder padding;
+- gtk_style_context_get_padding(style, 0, &padding);
++ gtk_style_context_get_padding(style, gtk_style_context_get_state(style), &padding);
+
+ paint_width = padding.left;
+ if (paint_width > rect->width)
+@@ -2004,18 +2180,13 @@ static gint
moz_gtk_progressbar_paint(cairo_t *cr, GdkRectangle* rect,
GtkTextDirection direction)
{
@@ -476,14 +826,14 @@ diff -up firefox-43.0.4/widget/gtk/gtk3drawing.c.gtk3-20 firefox-43.0.4/widget/g
- 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);
- gtk_style_context_restore(style);
-+ gtk_render_background(gProgressBar.styleTrough, cr,
++ gtk_render_background(gProgressBar.progress.styleTrough, cr,
+ rect->x, rect->y, rect->width, rect->height);
-+ gtk_render_frame(gProgressBar.styleTrough, cr,
++ gtk_render_frame(gProgressBar.progress.styleTrough, cr,
+ rect->x, rect->y, rect->width, rect->height);
return MOZ_GTK_SUCCESS;
}
-@@ -2027,16 +2100,9 @@ moz_gtk_progress_chunk_paint(cairo_t *cr
+@@ -2025,15 +2196,8 @@ moz_gtk_progress_chunk_paint(cairo_t *cr
GtkTextDirection direction,
GtkThemeWidgetType widget)
{
@@ -496,33 +846,218 @@ diff -up firefox-43.0.4/widget/gtk/gtk3drawing.c.gtk3-20 firefox-43.0.4/widget/g
- gtk_style_context_save(style);
- gtk_style_context_remove_class(style, GTK_STYLE_CLASS_TROUGH);
- gtk_style_context_add_class(style, GTK_STYLE_CLASS_PROGRESSBAR);
--
+ gtk_widget_set_direction(gProgressBar.widget, direction);
-+
+
if (widget == MOZ_GTK_PROGRESS_CHUNK_INDETERMINATE ||
widget == MOZ_GTK_PROGRESS_CHUNK_VERTICAL_INDETERMINATE) {
- /**
-@@ -2074,12 +2140,14 @@ moz_gtk_progress_chunk_paint(cairo_t *cr
+@@ -2072,12 +2236,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)) {
- 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);
-+ gtk_render_background(gProgressBar.styleProgress, cr,
++ gtk_render_background(gProgressBar.progress.styleProgress, cr,
+ rect->x, rect->y, rect->width, rect->height);
-+ gtk_render_frame(gProgressBar.styleProgress, cr,
++ gtk_render_frame(gProgressBar.progress.styleProgress, cr,
+ rect->x, rect->y, rect->width, rect->height);
} else {
- gtk_render_activity(style, cr, rect->x, rect->y, rect->width, rect->height);
-- }
-- gtk_style_context_restore(style);
-+ gtk_render_activity(gProgressBar.styleProgress, cr,
++ gtk_render_activity(gProgressBar.progress.styleProgress, cr,
+ rect->x, rect->y, rect->width, rect->height);
-+ }
+ }
+- gtk_style_context_restore(style);
return MOZ_GTK_SUCCESS;
}
-@@ -2815,9 +2883,12 @@ moz_gtk_get_widget_border(GtkThemeWidget
+@@ -2094,7 +2260,7 @@ moz_gtk_get_tab_thickness(void)
+
+ style = gtk_widget_get_style_context(gTabWidget);
+ gtk_style_context_add_class(style, GTK_STYLE_CLASS_NOTEBOOK);
+- gtk_style_context_get_border(style, 0, &border);
++ gtk_style_context_get_border(style, gtk_style_context_get_state(style), &border);
+
+ if (border.top < 2)
+ return 2; /* some themes don't set ythickness correctly */
+@@ -2290,7 +2456,7 @@ moz_gtk_tab_paint(cairo_t *cr, GdkRectan
+ gtk_style_context_save(style);
+ moz_gtk_tab_prepare_style_context(style, flags);
+
+- gtk_style_context_get_padding(style, GetStateFlagsFromGtkWidgetState(state), &padding);
++ moz_gtk_get_style_padding(style, GetStateFlagsFromGtkWidgetState(state), &padding);
+
+ focusRect.x += padding.left;
+ focusRect.width -= (padding.left + padding.right);
+@@ -2406,7 +2572,7 @@ moz_gtk_tab_scroll_arrow_paint(cairo_t *
+ }
+
+ static gint
+-moz_gtk_menu_bar_paint(cairo_t *cr, GdkRectangle* rect,
++moz_gtk_menu_bar_paint(cairo_t *cr, GdkRectangle* rect, GtkWidgetState* state,
+ GtkTextDirection direction)
+ {
+ GtkStyleContext* style;
+@@ -2467,7 +2633,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);
+- gtk_style_context_get_padding(style, 0, &padding);
++ gtk_style_context_get_padding(style, gtk_style_context_get_state(style), &padding);
+
+ x = rect->x + border_width;
+ y = rect->y + border_width;
+@@ -2521,7 +2687,8 @@ moz_gtk_menu_item_paint(cairo_t *cr, Gdk
+ item_widget = gMenuItemWidget;
+ }
+ style = gtk_widget_get_style_context(item_widget);
+- gtk_style_context_save(style);
++// TODO - FIX!
++// gtk_style_context_save(style);
+
+ if (flags & MOZ_TOPLEVEL_MENU_ITEM) {
+ gtk_style_context_add_class(style, GTK_STYLE_CLASS_MENUBAR);
+@@ -2540,7 +2707,7 @@ moz_gtk_menu_item_paint(cairo_t *cr, Gdk
+
+ gtk_render_background(style, cr, x, y, w, h);
+ gtk_render_frame(style, cr, x, y, w, h);
+- gtk_style_context_restore(style);
++// gtk_style_context_restore(style);
+ }
+
+ return MOZ_GTK_SUCCESS;
+@@ -2556,7 +2723,10 @@ moz_gtk_menu_arrow_paint(cairo_t *cr, Gd
+
+ ensure_menu_item_widget();
+ gtk_widget_set_direction(gMenuItemWidget, direction);
+-
++/*
++ state_flags |= (direction == GTK_TEXT_DIR_LTR) ? GTK_STATE_FLAG_DIR_LTR :
++ GTK_STATE_FLAG_DIR_RTL;
++*/
+ style = gtk_widget_get_style_context(gMenuItemWidget);
+ gtk_style_context_save(style);
+ gtk_style_context_add_class(style, GTK_STYLE_CLASS_MENUITEM);
+@@ -2606,7 +2776,7 @@ moz_gtk_check_menu_item_paint(cairo_t *c
+ }
+
+ gtk_style_context_set_state(style, state_flags);
+- gtk_style_context_get_padding(style, state_flags, &padding);
++ moz_gtk_get_style_padding(style, state_flags, &padding);
+
+ offset = gtk_container_get_border_width(GTK_CONTAINER(gCheckMenuItemWidget)) +
+ padding.left + 2;
+@@ -2658,7 +2828,7 @@ moz_gtk_add_style_border(GtkStyleContext
+ {
+ GtkBorder border;
+
+- gtk_style_context_get_border(style, 0, &border);
++ gtk_style_context_get_border(style, gtk_style_context_get_state(style), &border);
+
+ *left += border.left;
+ *right += border.right;
+@@ -2667,12 +2837,22 @@ moz_gtk_add_style_border(GtkStyleContext
+ }
+
+ static void
++moz_gtk_get_style_border(GtkStyleContext* style, GtkStateFlags state_flags,
++ GtkBorder *border)
++{
++ gtk_style_context_save(style);
++ gtk_style_context_set_state(style, state_flags);
++ gtk_style_context_get_border(style, gtk_style_context_get_state(style), border);
++ gtk_style_context_restore(style);
++}
++
++static void
+ moz_gtk_add_style_padding(GtkStyleContext* style,
+ gint* left, gint* top, gint* right, gint* bottom)
+ {
+ GtkBorder padding;
+
+- gtk_style_context_get_padding(style, 0, &padding);
++ gtk_style_context_get_padding(style, gtk_style_context_get_state(style), &padding);
+
+ *left += padding.left;
+ *right += padding.right;
+@@ -2680,6 +2860,16 @@ moz_gtk_add_style_padding(GtkStyleContex
+ *bottom += padding.bottom;
+ }
+
++static void
++moz_gtk_get_style_padding(GtkStyleContext* style, GtkStateFlags state_flags,
++ GtkBorder *padding)
++{
++ gtk_style_context_save(style);
++ gtk_style_context_set_state(style, state_flags);
++ gtk_style_context_get_padding(style, gtk_style_context_get_state(style), padding);
++ gtk_style_context_restore(style);
++}
++
+ gint
+ moz_gtk_get_widget_border(GtkThemeWidgetType widget, gint* left, gint* top,
+ gint* right, gint* bottom, GtkTextDirection direction,
+@@ -2694,36 +2884,27 @@ moz_gtk_get_widget_border(GtkThemeWidget
+ case MOZ_GTK_TOOLBAR_BUTTON:
+ {
+ ensure_button_widget();
+- style = gtk_widget_get_style_context(gButtonWidget);
+
+- *left = *top = *right = *bottom = gtk_container_get_border_width(GTK_CONTAINER(gButtonWidget));
+-
+- if (widget == MOZ_GTK_TOOLBAR_BUTTON) {
+- gtk_style_context_save(style);
+- gtk_style_context_add_class(style, "image-button");
+- }
+-
+- moz_gtk_add_style_padding(style, left, top, right, bottom);
+-
+- if (widget == MOZ_GTK_TOOLBAR_BUTTON)
+- gtk_style_context_restore(style);
++ *left = *top = *right = *bottom = gtk_container_get_border_width(GTK_CONTAINER(gButton.widget));
++ moz_gtk_add_style_padding(gButton.button.style, left, top, right, bottom);
+
+ // XXX: Subtract 1 pixel from the border to account for the added
+ // -moz-focus-inner border (Bug 1228281).
+ *left -= 1; *top -= 1; *right -= 1; *bottom -= 1;
+- moz_gtk_add_style_border(style, left, top, right, bottom);
++ moz_gtk_add_style_border(gButton.button.style, left, top, right, bottom);
++
+ return MOZ_GTK_SUCCESS;
+ }
+ case MOZ_GTK_ENTRY:
+ {
+ ensure_entry_widget();
+- style = gtk_widget_get_style_context(gEntryWidget);
+
+ // XXX: Subtract 1 pixel from the padding to account for the default
+ // padding in forms.css. See bug 1187385.
+ *left = *top = *right = *bottom = -1;
+- moz_gtk_add_style_padding(style, left, top, right, bottom);
+- moz_gtk_add_style_border(style, left, top, right, bottom);
++
++ moz_gtk_add_style_padding(gEntry.entry.style, left, top, right, bottom);
++ moz_gtk_add_style_border(gEntry.entry.style, left, top, right, bottom);
+
+ return MOZ_GTK_SUCCESS;
+ }
+@@ -2759,7 +2940,7 @@ moz_gtk_get_widget_border(GtkThemeWidget
+ break;
+ case MOZ_GTK_DROPDOWN_ENTRY:
+ ensure_combo_box_entry_widgets();
+- w = gComboBoxEntryTextareaWidget;
++ w = gComboBoxEntryTextarea.widget;
+ break;
+ case MOZ_GTK_DROPDOWN_ARROW:
+ ensure_combo_box_entry_widgets();
+@@ -2795,7 +2976,7 @@ moz_gtk_get_widget_border(GtkThemeWidget
+
+ if (!wide_separators) {
+ style = gtk_widget_get_style_context(gComboBoxSeparatorWidget);
+- gtk_style_context_get_border(style, 0, &border);
++ gtk_style_context_get_border(style, gtk_style_context_get_state(style), &border);
+ separator_width = border.left;
+ }
+ }
+@@ -2814,14 +2995,17 @@ moz_gtk_get_widget_border(GtkThemeWidget
w = gTabWidget;
break;
case MOZ_GTK_PROGRESSBAR:
@@ -531,31 +1066,88 @@ diff -up firefox-43.0.4/widget/gtk/gtk3drawing.c.gtk3-20 firefox-43.0.4/widget/g
- break;
+ {
+ ensure_progress_widget();
-+ moz_gtk_add_style_border(gProgressBar.styleTrough,
++ moz_gtk_add_style_border(gProgressBar.progress.styleTrough,
+ left, top, right, bottom);
+ return MOZ_GTK_SUCCESS;
+ }
case MOZ_GTK_SPINBUTTON_ENTRY:
case MOZ_GTK_SPINBUTTON_UP:
case MOZ_GTK_SPINBUTTON_DOWN:
-@@ -2841,12 +2912,13 @@ moz_gtk_get_widget_border(GtkThemeWidget
+ ensure_spin_widget();
+- w = gSpinWidget;
++ w = gSpin.widget;
+ break;
+ case MOZ_GTK_SCALE_HORIZONTAL:
+ ensure_scale_widget();
+@@ -2840,12 +3024,13 @@ moz_gtk_get_widget_border(GtkThemeWidget
{
if (widget == MOZ_GTK_CHECKBUTTON_CONTAINER) {
ensure_checkbox_widget();
- w = gCheckboxWidget;
+ w = gCheckbox.widget;
-+ style = gCheckbox.styleCheck;
++ style = gCheckbox.check.styleCheck;
} else {
ensure_radiobutton_widget();
- w = gRadiobuttonWidget;
+ w = gRadiobutton.widget;
-+ style = gRadiobutton.styleCheck;
++ style = gRadiobutton.check.styleCheck;
}
- style = gtk_widget_get_style_context(w);
*left = *top = *right = *bottom = gtk_container_get_border_width(GTK_CONTAINER(w));
moz_gtk_add_style_border(style,
-@@ -3123,7 +3195,7 @@ moz_gtk_get_scrollbar_metrics(MozGtkScro
+@@ -2978,6 +3163,32 @@ moz_gtk_get_combo_box_entry_button_size(
+ }
+
+ gint
++moz_gtk_get_entry_height(gint* height)
++{
++ GtkRequisition requisition;
++ ensure_entry_widget();
++
++ gtk_widget_get_preferred_size(gEntry.widget, NULL, &requisition);
++ *height = requisition.height;
++
++ return MOZ_GTK_SUCCESS;
++}
++
++
++gint
++moz_gtk_get_button_height(gint* height)
++{
++ GtkRequisition requisition;
++ ensure_entry_widget();
++
++ gtk_widget_get_preferred_size(gButton.widget, NULL, &requisition);
++ *height = requisition.height;
++
++ return MOZ_GTK_SUCCESS;
++}
++
++
++gint
+ moz_gtk_get_tab_scroll_arrow_size(gint* width, gint* height)
+ {
+ gint arrow_size;
+@@ -3022,7 +3233,7 @@ moz_gtk_get_toolbar_separator_width(gint
+ "separator-width", &separator_width,
+ NULL);
+ /* Just in case... */
+- gtk_style_context_get_border(style, 0, &border);
++ gtk_style_context_get_border(style, gtk_style_context_get_state(style), &border);
+ *size = MAX(*size, (wide_separators ? separator_width : border.left));
+ return MOZ_GTK_SUCCESS;
+ }
+@@ -3064,7 +3275,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);
+- gtk_style_context_get_padding(style, 0, &padding);
++ gtk_style_context_get_padding(style, gtk_style_context_get_state(style), &padding);
+
+ gtk_style_context_save(style);
+ gtk_style_context_add_class(style, GTK_STYLE_CLASS_SEPARATOR);
+@@ -3122,15 +3333,21 @@ moz_gtk_get_scrollbar_metrics(MozGtkScro
{
ensure_scrollbar_widget();
@@ -564,25 +1156,86 @@ diff -up firefox-43.0.4/widget/gtk/gtk3drawing.c.gtk3-20 firefox-43.0.4/widget/g
"slider_width", &metrics->slider_width,
"trough_border", &metrics->trough_border,
"stepper_size", &metrics->stepper_size,
-@@ -3131,7 +3203,7 @@ moz_gtk_get_scrollbar_metrics(MozGtkScro
+ "stepper_spacing", &metrics->stepper_spacing,
NULL);
- metrics->min_slider_size =
+- metrics->min_slider_size =
- gtk_range_get_min_slider_size(GTK_RANGE(gHorizScrollbarWidget));
-+ gtk_range_get_min_slider_size(GTK_RANGE(gHorizScrollbar.widget));
++ if (!gtk_check_version(3,19,7)) {
++ gtk_style_context_get(gVertScrollbar.scroll.styleSlider,
++ gtk_style_context_get_state(gVertScrollbar.scroll.styleSlider),
++ "min-height", &metrics->min_slider_size, NULL);
++ } else {
++ metrics->min_slider_size =
++ gtk_range_get_min_slider_size(GTK_RANGE(gVertScrollbar.widget));
++ }
return MOZ_GTK_SUCCESS;
}
-@@ -3377,7 +3449,7 @@ GtkWidget* moz_gtk_get_scrollbar_widget(
+@@ -3155,7 +3372,7 @@ moz_gtk_images_in_buttons()
+ GtkSettings* settings;
+
+ ensure_button_widget();
+- settings = gtk_widget_get_settings(gButtonWidget);
++ settings = gtk_widget_get_settings(gButton.widget);
+
+ g_object_get(settings, "gtk-button-images", &result, NULL);
+ return result;
+@@ -3183,7 +3400,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType
+ }
+ ensure_button_widget();
+ return moz_gtk_button_paint(cr, rect, state,
+- (GtkReliefStyle) flags, gButtonWidget,
++ (GtkReliefStyle) flags, gButton.widget,
+ direction);
+ break;
+ case MOZ_GTK_CHECKBUTTON:
+@@ -3233,7 +3450,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType
+ case MOZ_GTK_SPINBUTTON_ENTRY:
+ ensure_spin_widget();
+ return moz_gtk_entry_paint(cr, rect, state,
+- gSpinWidget, direction);
++ &gSpin, direction);
+ break;
+ case MOZ_GTK_GRIPPER:
+ return moz_gtk_gripper_paint(cr, rect, state,
+@@ -3260,7 +3477,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType
+ case MOZ_GTK_ENTRY:
+ ensure_entry_widget();
+ return moz_gtk_entry_paint(cr, rect, state,
+- gEntryWidget, direction);
++ &gEntry, direction);
+ break;
+ case MOZ_GTK_DROPDOWN:
+ return moz_gtk_combo_box_paint(cr, rect, state, direction);
+@@ -3272,7 +3489,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType
+ case MOZ_GTK_DROPDOWN_ENTRY:
+ ensure_combo_box_entry_widgets();
+ return moz_gtk_entry_paint(cr, rect, state,
+- gComboBoxEntryTextareaWidget, direction);
++ &gComboBoxEntryTextarea, direction);
+ break;
+ case MOZ_GTK_CHECKBUTTON_CONTAINER:
+ case MOZ_GTK_RADIOBUTTON_CONTAINER:
+@@ -3324,7 +3541,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType
+ (GtkArrowType) flags, direction);
+ break;
+ case MOZ_GTK_MENUBAR:
+- return moz_gtk_menu_bar_paint(cr, rect, direction);
++ return moz_gtk_menu_bar_paint(cr, rect, state, direction);
+ break;
+ case MOZ_GTK_MENUPOPUP:
+ return moz_gtk_menu_popup_paint(cr, rect, direction);
+@@ -3375,7 +3592,7 @@ GtkWidget* moz_gtk_get_scrollbar_widget(
{
MOZ_ASSERT(is_initialized, "Forgot to call moz_gtk_init()");
ensure_scrollbar_widget();
- return gHorizScrollbarWidget;
-+ return gHorizScrollbar.widget;
++ return gVertScrollbar.widget;
}
gboolean moz_gtk_has_scrollbar_buttons(void)
-@@ -3385,7 +3457,7 @@ gboolean moz_gtk_has_scrollbar_buttons(v
+@@ -3383,7 +3600,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();
@@ -591,33 +1244,51 @@ diff -up firefox-43.0.4/widget/gtk/gtk3drawing.c.gtk3-20 firefox-43.0.4/widget/g
"has-backward-stepper", &backward,
"has-forward-stepper", &forward,
"has-secondary-backward-stepper", &secondary_backward,
-@@ -3414,10 +3486,10 @@ moz_gtk_shutdown()
- gButtonWidget = NULL;
+@@ -3409,17 +3626,19 @@ moz_gtk_shutdown()
+
+ gProtoWindow = NULL;
+ gProtoLayout = NULL;
+- gButtonWidget = NULL;
++
++ // MozWidgets
++ moz_gtk_widget_free(&gButton);
gToggleButtonWidget = NULL;
gButtonArrowWidget = NULL;
- gCheckboxWidget = NULL;
- gRadiobuttonWidget = NULL;
- gHorizScrollbarWidget = NULL;
- gVertScrollbarWidget = NULL;
-+// gCheckboxWidget = NULL;
-+// gRadiobuttonWidget = NULL;
-+// gHorizScrollbarWidget = NULL;
-+// gVertScrollbarWidget = NULL;
- gSpinWidget = NULL;
+- gSpinWidget = NULL;
++ moz_gtk_widget_free(&gCheckbox);
++ moz_gtk_widget_free(&gRadiobutton);
++ moz_gtk_widget_free(&gHorizScrollbar);
++ moz_gtk_widget_free(&gVertScrollbar);
++ moz_gtk_widget_free(&gSpin);
gHScaleWidget = NULL;
gVScaleWidget = NULL;
-@@ -3434,7 +3506,7 @@ moz_gtk_shutdown()
+- gEntryWidget = NULL;
++ moz_gtk_widget_free(&gEntry);
+ gComboBoxWidget = NULL;
+ gComboBoxButtonWidget = NULL;
+ gComboBoxSeparatorWidget = NULL;
+@@ -3427,12 +3646,12 @@ moz_gtk_shutdown()
+ gComboBoxEntryWidget = NULL;
+ gComboBoxEntryButtonWidget = NULL;
+ gComboBoxEntryArrowWidget = NULL;
+- gComboBoxEntryTextareaWidget = NULL;
++ moz_gtk_widget_free(&gComboBoxEntryTextarea);
+ gHandleBoxWidget = NULL;
gToolbarWidget = NULL;
gStatusbarWidget = NULL;
gFrameWidget = NULL;
- gProgressWidget = NULL;
-+ //gProgressBar = NULL;
++ moz_gtk_widget_free(&gProgressBar);
gTabWidget = NULL;
gTooltipWidget = NULL;
gMenuBarWidget = NULL;
-diff -up firefox-43.0.4/widget/gtk/gtkdrawing.h.gtk3-20 firefox-43.0.4/widget/gtk/gtkdrawing.h
---- firefox-43.0.4/widget/gtk/gtkdrawing.h.gtk3-20 2016-01-06 01:44:12.000000000 +0100
-+++ firefox-43.0.4/widget/gtk/gtkdrawing.h 2016-01-14 10:51:08.986952697 +0100
+diff -up firefox-45.0/widget/gtk/gtkdrawing.h.gtk3-20 firefox-45.0/widget/gtk/gtkdrawing.h
+--- firefox-45.0/widget/gtk/gtkdrawing.h.gtk3-20 2016-03-03 22:48:07.000000000 +0100
++++ firefox-45.0/widget/gtk/gtkdrawing.h 2016-03-15 13:58:06.910489843 +0100
@@ -67,6 +67,13 @@ typedef enum {
MOZ_GTK_TAB_SELECTED = 1 << 10
} GtkTabFlags;
@@ -632,7 +1303,18 @@ diff -up firefox-43.0.4/widget/gtk/gtkdrawing.h.gtk3-20 firefox-43.0.4/widget/gt
/** flags for menuitems **/
typedef enum {
/* menuitem is part of the menubar */
-@@ -464,6 +471,10 @@ gboolean moz_gtk_images_in_buttons(void)
+@@ -394,6 +401,10 @@ gint moz_gtk_get_tab_scroll_arrow_size(g
+ */
+ gint moz_gtk_get_arrow_size(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)
*/
gboolean moz_gtk_has_scrollbar_buttons(void);
@@ -640,13 +1322,35 @@ diff -up firefox-43.0.4/widget/gtk/gtkdrawing.h.gtk3-20 firefox-43.0.4/widget/gt
+GtkStyleContext *
+moz_gtk_style_create(GtkCssNode *node, GtkStyleContext *parent);
+
++
++
#ifdef __cplusplus
}
#endif /* __cplusplus */
-diff -up firefox-43.0.4/widget/gtk/mozgtk/mozgtk.c.gtk3-20 firefox-43.0.4/widget/gtk/mozgtk/mozgtk.c
---- firefox-43.0.4/widget/gtk/mozgtk/mozgtk.c.gtk3-20 2016-01-06 01:44:12.000000000 +0100
-+++ firefox-43.0.4/widget/gtk/mozgtk/mozgtk.c 2016-01-14 10:51:08.986952697 +0100
-@@ -547,6 +547,7 @@ STUB(gtk_style_context_get_border_color)
+diff -up firefox-45.0/widget/gtk/mozgtk/mozgtk.c.gtk3-20 firefox-45.0/widget/gtk/mozgtk/mozgtk.c
+--- firefox-45.0/widget/gtk/mozgtk/mozgtk.c.gtk3-20 2016-03-03 22:48:07.000000000 +0100
++++ firefox-45.0/widget/gtk/mozgtk/mozgtk.c 2016-03-15 13:58:06.914489856 +0100
+@@ -388,6 +388,7 @@ STUB(gtk_settings_get_for_screen)
+ STUB(gtk_socket_add_id)
+ STUB(gtk_socket_get_id)
+ STUB(gtk_socket_get_type)
++STUB(gtk_socket_get_plug_window)
+ STUB(gtk_socket_new)
+ STUB(gtk_spin_button_new)
+ STUB(gtk_statusbar_new)
+@@ -502,6 +503,11 @@ STUB(gtk_window_set_type_hint)
+ STUB(gtk_window_set_wmclass)
+ STUB(gtk_window_unfullscreen)
+ STUB(gtk_window_unmaximize)
++STUB(gtk_widget_path_iter_get_state)
++STUB(gtk_widget_get_preferred_height_and_baseline_for_width)
++STUB(gtk_entry_get_text_area)
++STUB(gtk_check_menu_item_get_type)
++STUB(gtk_spin_button_get_type)
+ #endif
+
+ #ifdef GTK3_SYMBOLS
+@@ -549,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)
@@ -654,7 +1358,7 @@ diff -up firefox-43.0.4/widget/gtk/mozgtk/mozgtk.c.gtk3-20 firefox-43.0.4/widget
STUB(gtk_style_context_has_class)
STUB(gtk_style_context_new)
STUB(gtk_style_context_remove_class)
-@@ -574,6 +575,12 @@ STUB(gtk_color_chooser_get_type)
+@@ -576,6 +583,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)
@@ -664,13 +1368,69 @@ diff -up firefox-43.0.4/widget/gtk/mozgtk/mozgtk.c.gtk3-20 firefox-43.0.4/widget
+STUB(gtk_widget_path_iter_add_class)
+STUB(gtk_style_context_set_parent)
+STUB(gtk_widget_path_unref)
++STUB(gtk_button_get_type)
#endif
#ifdef GTK2_SYMBOLS
-diff -up firefox-43.0.4/widget/gtk/nsLookAndFeel.cpp.gtk3-20 firefox-43.0.4/widget/gtk/nsLookAndFeel.cpp
---- firefox-43.0.4/widget/gtk/nsLookAndFeel.cpp.gtk3-20 2016-01-06 01:44:13.000000000 +0100
-+++ firefox-43.0.4/widget/gtk/nsLookAndFeel.cpp 2016-01-14 10:51:08.987952700 +0100
-@@ -983,7 +983,7 @@ nsLookAndFeel::Init()
+diff -up firefox-45.0/widget/gtk/nsLookAndFeel.cpp.gtk3-20 firefox-45.0/widget/gtk/nsLookAndFeel.cpp
+--- firefox-45.0/widget/gtk/nsLookAndFeel.cpp.gtk3-20 2016-03-03 22:48:07.000000000 +0100
++++ firefox-45.0/widget/gtk/nsLookAndFeel.cpp 2016-03-15 13:58:06.911489846 +0100
+@@ -232,14 +232,18 @@ nsLookAndFeel::NativeGetColor(ColorID aI
+ case eColorID_activeborder:
+ // active window border
+ gtk_style_context_get_border_color(mBackgroundStyle,
+- GTK_STATE_FLAG_NORMAL, &gdk_color);
++ gtk_style_context_get_state(mBackgroundStyle),
++ &gdk_color);
+ aColor = GDK_RGBA_TO_NS_RGBA(gdk_color);
+ break;
+ case eColorID_inactiveborder:
+ // inactive window border
++ gtk_style_context_save(mBackgroundStyle);
++ gtk_style_context_set_state(mBackgroundStyle, GTK_STATE_FLAG_INSENSITIVE);
+ gtk_style_context_get_border_color(mBackgroundStyle,
+- GTK_STATE_FLAG_INSENSITIVE,
++ gtk_style_context_get_state(mBackgroundStyle),
+ &gdk_color);
++ gtk_style_context_restore(mBackgroundStyle);
+ 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
+ break;
+ case eColorID_inactivecaption:
+ // inactive window caption
++ gtk_style_context_save(mBackgroundStyle);
++ gtk_style_context_set_state(mBackgroundStyle, GTK_STATE_FLAG_INSENSITIVE);
+ gtk_style_context_get_background_color(mBackgroundStyle,
+- GTK_STATE_FLAG_INSENSITIVE,
++ gtk_style_context_get_state(mBackgroundStyle),
+ &gdk_color);
++ gtk_style_context_restore(mBackgroundStyle);
+ aColor = GDK_RGBA_TO_NS_RGBA(gdk_color);
+ break;
+ #endif
+@@ -376,13 +383,17 @@ nsLookAndFeel::NativeGetColor(ColorID aI
+ case eColorID__moz_buttondefault:
+ // default button border color
+ gtk_style_context_get_border_color(mButtonStyle,
+- GTK_STATE_FLAG_NORMAL, &gdk_color);
++ gtk_style_context_get_state(mButtonStyle),
++ &gdk_color);
+ aColor = GDK_RGBA_TO_NS_RGBA(gdk_color);
+ break;
+ case eColorID__moz_buttonhoverface:
++ gtk_style_context_save(mButtonStyle);
++ gtk_style_context_set_state(mButtonStyle, GTK_STATE_FLAG_PRELIGHT);
+ gtk_style_context_get_background_color(mButtonStyle,
+- GTK_STATE_FLAG_PRELIGHT,
++ gtk_style_context_get_state(mButtonStyle),
+ &gdk_color);
++ gtk_style_context_restore(mButtonStyle);
+ aColor = GDK_RGBA_TO_NS_RGBA(gdk_color);
+ break;
+ case eColorID__moz_buttonhovertext:
+@@ -989,7 +1000,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);
@@ -679,7 +1439,7 @@ diff -up firefox-43.0.4/widget/gtk/nsLookAndFeel.cpp.gtk3-20 firefox-43.0.4/widg
sMozScrollbar = GDK_RGBA_TO_NS_RGBA(color);
g_object_unref(style);
-@@ -991,18 +991,18 @@ nsLookAndFeel::Init()
+@@ -997,18 +1008,18 @@ nsLookAndFeel::Init()
style = create_context(path);
gtk_style_context_save(style);
gtk_style_context_add_class(style, GTK_STYLE_CLASS_BACKGROUND);
@@ -702,7 +1462,7 @@ diff -up firefox-43.0.4/widget/gtk/nsLookAndFeel.cpp.gtk3-20 firefox-43.0.4/widg
sInfoText = GDK_RGBA_TO_NS_RGBA(color);
g_object_unref(style);
-@@ -1017,20 +1017,26 @@ nsLookAndFeel::Init()
+@@ -1023,20 +1034,26 @@ nsLookAndFeel::Init()
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
style = gtk_widget_get_style_context(accel_label);
@@ -734,7 +1494,7 @@ diff -up firefox-43.0.4/widget/gtk/nsLookAndFeel.cpp.gtk3-20 firefox-43.0.4/widg
g_object_unref(menu);
#endif
-@@ -1139,44 +1145,53 @@ nsLookAndFeel::Init()
+@@ -1145,44 +1162,58 @@ nsLookAndFeel::Init()
GDK_COLOR_TO_NS_RGB(style->dark[GTK_STATE_NORMAL]);
}
#else
@@ -745,6 +1505,7 @@ diff -up firefox-43.0.4/widget/gtk/nsLookAndFeel.cpp.gtk3-20 firefox-43.0.4/widg
+
+ GtkStyleContext *styleLabel;
+ GtkStyleContext *styleSelection;
++ GtkBorder padding;
+
// Text colors
- style = gtk_widget_get_style_context(textView);
@@ -752,6 +1513,10 @@ diff -up firefox-43.0.4/widget/gtk/nsLookAndFeel.cpp.gtk3-20 firefox-43.0.4/widg
- gtk_style_context_add_class(style, GTK_STYLE_CLASS_VIEW);
- gtk_style_context_get_background_color(style, GTK_STATE_FLAG_NORMAL, &color);
+ styleLabel = moz_gtk_style_create(labelPath, NULL);
++
++ gtk_style_context_get_border(styleLabel, gtk_style_context_get_state(styleLabel), &padding);
++ gtk_style_context_get_padding(styleLabel, gtk_style_context_get_state(styleLabel), &padding);
++
+ styleSelection = moz_gtk_style_create(labelPath+1, styleLabel);
+ gtk_style_context_get_background_color(styleLabel, gtk_style_context_get_state(styleLabel), &color);
sMozFieldBackground = GDK_RGBA_TO_NS_RGBA(color);
@@ -805,7 +1570,7 @@ diff -up firefox-43.0.4/widget/gtk/nsLookAndFeel.cpp.gtk3-20 firefox-43.0.4/widg
// GTK's guide to fancy odd row background colors:
// 1) Check if a theme explicitly defines an odd row color
-@@ -1189,7 +1204,7 @@ nsLookAndFeel::Init()
+@@ -1195,7 +1226,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);
@@ -814,7 +1579,7 @@ diff -up firefox-43.0.4/widget/gtk/nsLookAndFeel.cpp.gtk3-20 firefox-43.0.4/widg
sOddCellBackground = GDK_RGBA_TO_NS_RGBA(color);
gtk_style_context_restore(style);
-@@ -1199,7 +1214,7 @@ nsLookAndFeel::Init()
+@@ -1205,7 +1236,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);
@@ -823,7 +1588,7 @@ diff -up firefox-43.0.4/widget/gtk/nsLookAndFeel.cpp.gtk3-20 firefox-43.0.4/widg
sFrameInnerDarkBorder = sFrameOuterLightBorder = GDK_RGBA_TO_NS_RGBA(color);
gtk_widget_path_free(path);
-@@ -1211,9 +1226,11 @@ nsLookAndFeel::Init()
+@@ -1217,9 +1248,11 @@ nsLookAndFeel::Init()
gtk_container_add(GTK_CONTAINER(parent), infoBar);
gtk_container_add(GTK_CONTAINER(infoBarContent), infoBarLabel);
style = gtk_widget_get_style_context(infoBarLabel);
@@ -836,3 +1601,38 @@ diff -up firefox-43.0.4/widget/gtk/nsLookAndFeel.cpp.gtk3-20 firefox-43.0.4/widg
#endif
// Some themes have a unified menu bar, and support window dragging on it
gboolean supports_menubar_drag = FALSE;
+diff -up firefox-45.0/widget/gtk/nsNativeThemeGTK.cpp.gtk3-20 firefox-45.0/widget/gtk/nsNativeThemeGTK.cpp
+--- firefox-45.0/widget/gtk/nsNativeThemeGTK.cpp.gtk3-20 2016-03-03 22:48:07.000000000 +0100
++++ firefox-45.0/widget/gtk/nsNativeThemeGTK.cpp 2016-03-15 13:58:06.911489846 +0100
+@@ -1548,9 +1548,6 @@ nsNativeThemeGTK::GetMinimumWidgetSize(n
+ case NS_THEME_RADIO_CONTAINER:
+ case NS_THEME_CHECKBOX_LABEL:
+ case NS_THEME_RADIO_LABEL:
+- case NS_THEME_BUTTON:
+- case NS_THEME_DROPDOWN:
+- 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;
+ }
++ break;
++ case NS_THEME_BUTTON:
++ case NS_THEME_DROPDOWN:
++ case NS_THEME_TOOLBAR_BUTTON:
++ {
++ moz_gtk_get_button_height(&aResult->height);
++ }
++ break;
++ case NS_THEME_FOCUS_OUTLINE:
++ case NS_THEME_NUMBER_INPUT:
++ case NS_THEME_TEXTFIELD:
++ case NS_THEME_TEXTFIELD_MULTILINE:
++ {
++ moz_gtk_get_entry_height(&aResult->height);
++ }
+ break;
+ case NS_THEME_TOOLBAR_SEPARATOR:
+ {
bgstack15