summaryrefslogtreecommitdiff
path: root/www/firefox/files/patch-bug1143686
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2015-03-31 19:10:39 +0000
committerJan Beich <jbeich@FreeBSD.org>2015-03-31 19:10:39 +0000
commit351d85711df71af466856eb2b73498a7f8cc86a0 (patch)
tree1ce9cd2638ce5cb614cc68bc843ea89d8bcb6231 /www/firefox/files/patch-bug1143686
parentRemove useless IGNORE for TCP_WRAPPERS and PAM. (diff)
- Update gmp-api to 38.0
- Update Firefox to 37.0 - Update Firefox ESR and libxul to 31.6.0 - Update Thunderbird to 31.6.0 - Backport a few GTK3 fixes to Firefox 37 MFH: 2015Q1 Security: https://vuxml.freebsd.org/freebsd/d0c97697-df2c-4b8b-bff2-cec24dc35af8.html
Notes
Notes: svn path=/head/; revision=382860
Diffstat (limited to 'www/firefox/files/patch-bug1143686')
-rw-r--r--www/firefox/files/patch-bug114368646
1 files changed, 46 insertions, 0 deletions
diff --git a/www/firefox/files/patch-bug1143686 b/www/firefox/files/patch-bug1143686
new file mode 100644
index 000000000000..d4cc2834d67e
--- /dev/null
+++ b/www/firefox/files/patch-bug1143686
@@ -0,0 +1,46 @@
+commit e50e738
+Author: Martin Stransky <stransky@redhat.com>
+Date: Mon Mar 16 08:00:00 2015 -0400
+
+ Bug 1143686 - Gtk3 - Render scrollbar thumb with margin. r=karlt
+---
+ widget/gtk/gtk3drawing.c | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+diff --git widget/gtk/gtk3drawing.c widget/gtk/gtk3drawing.c
+index 17f46ab..08a58d6 100644
+--- widget/gtk/gtk3drawing.c
++++ widget/gtk/gtk3drawing.c
+@@ -1230,6 +1230,7 @@ moz_gtk_scrollbar_thumb_paint(GtkThemeWidgetType widget,
+ GtkStyleContext* style;
+ GtkScrollbar *scrollbar;
+ GtkAdjustment *adj;
++ GtkBorder margin;
+
+ ensure_scrollbar_widget();
+
+@@ -1239,15 +1240,20 @@ moz_gtk_scrollbar_thumb_paint(GtkThemeWidgetType widget,
+ scrollbar = GTK_SCROLLBAR(gVertScrollbarWidget);
+
+ gtk_widget_set_direction(GTK_WIDGET(scrollbar), direction);
+-
++
+ style = gtk_widget_get_style_context(GTK_WIDGET(scrollbar));
+ gtk_style_context_save(style);
+-
++
+ gtk_style_context_add_class(style, GTK_STYLE_CLASS_SLIDER);
+ gtk_style_context_set_state(style, state_flags);
+
+- gtk_render_slider(style, cr, rect->x, rect->y,
+- rect->width, rect->height,
++ gtk_style_context_get_margin (style, state_flags, &margin);
++
++ gtk_render_slider(style, cr,
++ rect->x + margin.left,
++ rect->y + margin.top,
++ rect->width - margin.left - margin.right,
++ rect->height - margin.top - margin.bottom,
+ (widget == MOZ_GTK_SCROLLBAR_THUMB_HORIZONTAL) ?
+ GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL);
+