[gnome-themes-standard] gtk2: fix white border around background when overridden

[Cosimo Cecchi <cosimoc src gnome org>]

commit c9d21d9963c6c3fc7104ff3521eeab37cc57b974
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Feb 25 12:12:39 2013 -0500

    gtk2: fix white border around background when overridden
    
    The border assets we used previously had a fully opaque background
    filled inside the border stroke.
    When the background color is overridden by the application, part of the
    frame will be drawn on top of the overridden background, which won't
    look good if background colors don't match.
    To fix this, use borders with a transparent fill in the middle.
    Don't use this new assets for Libreoffice though, as it won't work there
    for missing alpha channel support.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=685712

 .../gtk-2.0/Entry/combo-entry-border-active-bg.png |  Bin 299 -> 274 bytes
 .../Entry/combo-entry-border-active-notebook.png   |  Bin 290 -> 274 bytes
 .../Entry/combo-entry-border-active-rtl-bg.png     |  Bin 325 -> 295 bytes
 .../combo-entry-border-active-rtl-notebook.png     |  Bin 302 -> 295 bytes
 .../gtk-2.0/Entry/combo-entry-border-bg.png        |  Bin 307 -> 334 bytes
 .../gtk-2.0/Entry/combo-entry-border-notebook.png  |  Bin 304 -> 304 bytes
 .../gtk-2.0/Entry/combo-entry-border-rtl-bg.png    |  Bin 328 -> 373 bytes
 .../Entry/combo-entry-border-rtl-notebook.png      |  Bin 308 -> 322 bytes
 .../gtk-2.0/Entry/entry-border-active-bg-solid.png |  Bin 0 -> 402 bytes
 .../gtk-2.0/Entry/entry-border-active-bg.png       |  Bin 402 -> 355 bytes
 .../gtk-2.0/Entry/entry-border-active-notebook.png |  Bin 377 -> 356 bytes
 .../gtk-2.0/Entry/entry-border-bg-solid.png        |  Bin 0 -> 406 bytes
 themes/Adwaita/gtk-2.0/Entry/entry-border-bg.png   |  Bin 406 -> 427 bytes
 .../gtk-2.0/Entry/entry-border-notebook.png        |  Bin 393 -> 407 bytes
 themes/Adwaita/gtk-2.0/Makefile.am                 |    2 ++
 themes/Adwaita/gtk-2.0/gtkrc                       |   19 +++++++++++++++++++
 16 files changed, 21 insertions(+), 0 deletions(-)
---
diff --git a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-bg.png 
b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-bg.png
index bf41b04..3ec5cfd 100644
Binary files a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-bg.png and 
b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-bg.png differ
diff --git a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-notebook.png 
b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-notebook.png
index 1eba7fe..3f400ce 100644
Binary files a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-notebook.png and 
b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-notebook.png differ
diff --git a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-rtl-bg.png 
b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-rtl-bg.png
index aba98bc..e20312b 100644
Binary files a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-rtl-bg.png and 
b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-rtl-bg.png differ
diff --git a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-rtl-notebook.png 
b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-rtl-notebook.png
index 1ad5f65..4aea86f 100644
Binary files a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-rtl-notebook.png and 
b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-active-rtl-notebook.png differ
diff --git a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-bg.png 
b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-bg.png
index 3235336..5717fab 100644
Binary files a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-bg.png and 
b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-bg.png differ
diff --git a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-notebook.png 
b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-notebook.png
index b8e1ad4..217a7e2 100644
Binary files a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-notebook.png and 
b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-notebook.png differ
diff --git a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-rtl-bg.png 
b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-rtl-bg.png
index 99e5818..0df28c5 100644
Binary files a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-rtl-bg.png and 
b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-rtl-bg.png differ
diff --git a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-rtl-notebook.png 
b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-rtl-notebook.png
index 8e7d0c0..a4f9bbb 100644
Binary files a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-rtl-notebook.png and 
b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-rtl-notebook.png differ
diff --git a/themes/Adwaita/gtk-2.0/Entry/entry-border-active-bg-solid.png 
b/themes/Adwaita/gtk-2.0/Entry/entry-border-active-bg-solid.png
new file mode 100644
index 0000000..85839b5
Binary files /dev/null and b/themes/Adwaita/gtk-2.0/Entry/entry-border-active-bg-solid.png differ
diff --git a/themes/Adwaita/gtk-2.0/Entry/entry-border-active-bg.png 
b/themes/Adwaita/gtk-2.0/Entry/entry-border-active-bg.png
index 85839b5..c9abe1e 100644
Binary files a/themes/Adwaita/gtk-2.0/Entry/entry-border-active-bg.png and 
b/themes/Adwaita/gtk-2.0/Entry/entry-border-active-bg.png differ
diff --git a/themes/Adwaita/gtk-2.0/Entry/entry-border-active-notebook.png 
b/themes/Adwaita/gtk-2.0/Entry/entry-border-active-notebook.png
index 358a5c7..15c343f 100644
Binary files a/themes/Adwaita/gtk-2.0/Entry/entry-border-active-notebook.png and 
b/themes/Adwaita/gtk-2.0/Entry/entry-border-active-notebook.png differ
diff --git a/themes/Adwaita/gtk-2.0/Entry/entry-border-bg-solid.png 
b/themes/Adwaita/gtk-2.0/Entry/entry-border-bg-solid.png
new file mode 100644
index 0000000..4fd41cd
Binary files /dev/null and b/themes/Adwaita/gtk-2.0/Entry/entry-border-bg-solid.png differ
diff --git a/themes/Adwaita/gtk-2.0/Entry/entry-border-bg.png 
b/themes/Adwaita/gtk-2.0/Entry/entry-border-bg.png
index 4fd41cd..3a492da 100644
Binary files a/themes/Adwaita/gtk-2.0/Entry/entry-border-bg.png and 
b/themes/Adwaita/gtk-2.0/Entry/entry-border-bg.png differ
diff --git a/themes/Adwaita/gtk-2.0/Entry/entry-border-notebook.png 
b/themes/Adwaita/gtk-2.0/Entry/entry-border-notebook.png
index c831b2b..246f2fc 100644
Binary files a/themes/Adwaita/gtk-2.0/Entry/entry-border-notebook.png and 
b/themes/Adwaita/gtk-2.0/Entry/entry-border-notebook.png differ
diff --git a/themes/Adwaita/gtk-2.0/Makefile.am b/themes/Adwaita/gtk-2.0/Makefile.am
index 8f24473..214ef93 100644
--- a/themes/Adwaita/gtk-2.0/Makefile.am
+++ b/themes/Adwaita/gtk-2.0/Makefile.am
@@ -75,6 +75,8 @@ asset_data = \
        Entry/entry-border-fill-solid.png \
        Entry/entry-border-bg.png \
        Entry/entry-border-active-bg.png \
+       Entry/entry-border-bg-solid.png \
+       Entry/entry-border-active-bg-solid.png \
        Entry/entry-border-disabled-bg.png \
        Entry/entry-border-notebook.png \
        Entry/entry-border-active-notebook.png \
diff --git a/themes/Adwaita/gtk-2.0/gtkrc b/themes/Adwaita/gtk-2.0/gtkrc
index b00d6f8..27d3656 100755
--- a/themes/Adwaita/gtk-2.0/gtkrc
+++ b/themes/Adwaita/gtk-2.0/gtkrc
@@ -1678,6 +1678,25 @@ style "libreoffice_entry"
                overlay_border          = { 0, 0, 0, 0 }
                 overlay_stretch         = TRUE
         }
+       image
+       {
+               function                = SHADOW
+               detail                  = "entry"
+                state                   = NORMAL
+               shadow                  = IN
+               file                    = "Entry/entry-border-bg-solid.png"
+               border                  = { 4, 4, 4, 4 }
+               stretch                 = TRUE
+       }
+        image
+        {
+               function                = SHADOW
+               detail                  = "entry"
+                state                   = ACTIVE
+               file                    = "Entry/entry-border-active-bg-solid.png"
+               border                  = { 4, 4, 4, 4 }
+               stretch                 = TRUE
+        }
         }
 }