From 500aa2c932cdcaca84a4f60ce1a9226cce04cdf3 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@anakreon.cz>
Date: May 29 2015 11:41:27 +0000
Subject: Added patch for mozbz#1160154 - huge bookmark padding


---

diff --git a/firefox.spec b/firefox.spec
index b93f23f..2558043 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -107,7 +107,7 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        38.0.1
-Release:        3%{?pre_tag}%{?dist}
+Release:        4%{?pre_tag}%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -158,6 +158,7 @@ Patch416:        mozilla-1161056.patch
 Patch417:        mozilla-1144745-1.patch
 Patch418:        mozilla-1144745-2.patch
 Patch419:        mozilla-1144745-3.patch
+Patch420:        mozilla-1160154.patch
 
 # Fix Skia Neon stuff on AArch64
 Patch500:        aarch64-fix-skia.patch
@@ -317,6 +318,7 @@ cd %{tarballdir}
 %patch417 -p1 -b .1144745-1
 %patch418 -p1 -b .1144745-2
 %patch419 -p1 -b .1144745-3
+%patch420 -p1 -b .1160154
 %endif
 
 %patch500 -p1
@@ -808,6 +810,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Fri May 29 2015 Martin Stransky <stransky@redhat.com> - 38.0.1-4
+- Added patch for mozbz#1160154 - huge bookmark padding
+
 * Tue May 26 2015 Martin Stransky <stransky@redhat.com> - 38.0.1-3
 - spec clean up
 
diff --git a/mozilla-1160154.patch b/mozilla-1160154.patch
new file mode 100644
index 0000000..8971fbb
--- /dev/null
+++ b/mozilla-1160154.patch
@@ -0,0 +1,53 @@
+diff --git a/widget/gtk/gtk3drawing.c b/widget/gtk/gtk3drawing.c
+--- a/widget/gtk/gtk3drawing.c
++++ b/widget/gtk/gtk3drawing.c
+@@ -72,16 +72,19 @@ static gboolean is_initialized;
+ #define ARROW_DOWN    G_PI
+ #define ARROW_RIGHT   G_PI_2
+ #define ARROW_LEFT    (G_PI+G_PI_2)
+ 
+ #if !GTK_CHECK_VERSION(3,14,0)
+ #define GTK_STATE_FLAG_CHECKED (1 << 11)
+ #endif
+ 
++// See Bug 1160154 for details
++#define MAX_WIDGET_PADDING 6
++
+ static GtkStateFlags
+ GetStateFlagsFromGtkWidgetState(GtkWidgetState* state)
+ {
+     GtkStateFlags stateFlags = GTK_STATE_FLAG_NORMAL;
+ 
+     if (state->disabled)
+         stateFlags = GTK_STATE_FLAG_INSENSITIVE;
+     else {    
+@@ -2590,22 +2593,22 @@ moz_gtk_add_style_border(GtkStyleContext
+ }
+ 
+ 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);
+-
+-    *left += padding.left;
+-    *right += padding.right;
+-    *top += padding.top;
+-    *bottom += padding.bottom;
++    gtk_style_context_get_padding(style, 0, &padding);	
++
++    *left += (padding.left > MAX_WIDGET_PADDING) ? MAX_WIDGET_PADDING : padding.left;
++    *right += (padding.right > MAX_WIDGET_PADDING) ? MAX_WIDGET_PADDING : padding.right;
++    *top += (padding.top > MAX_WIDGET_PADDING) ? MAX_WIDGET_PADDING : padding.top;
++    *bottom += (padding.bottom > MAX_WIDGET_PADDING) ? MAX_WIDGET_PADDING : padding.bottom;
+ }
+ 
+ gint
+ moz_gtk_get_widget_border(GtkThemeWidgetType widget, gint* left, gint* top,
+                           gint* right, gint* bottom, GtkTextDirection direction,
+                           gboolean inhtml)
+ {
+     GtkWidget* w;
+