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

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 bf41b04f..3ec5cfdb 100644
--- 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
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 1eba7fe5..3f400ce8 100644
--- 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
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 aba98bca..e20312ba 100644
--- 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
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 1ad5f652..4aea86fc 100644
--- 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
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 3235336e..5717fab1 100644
--- a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-bg.png
+++ b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-bg.png
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 b8e1ad4a..217a7e2c 100644
--- a/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-notebook.png
+++ b/themes/Adwaita/gtk-2.0/Entry/combo-entry-border-notebook.png
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 99e58184..0df28c54 100644
--- 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
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 8e7d0c0e..a4f9bbbf 100644
--- 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
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 00000000..85839b54
--- /dev/null
+++ b/themes/Adwaita/gtk-2.0/Entry/entry-border-active-bg-solid.png
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 85839b54..c9abe1eb 100644
--- a/themes/Adwaita/gtk-2.0/Entry/entry-border-active-bg.png
+++ b/themes/Adwaita/gtk-2.0/Entry/entry-border-active-bg.png
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 358a5c7e..15c343f9 100644
--- a/themes/Adwaita/gtk-2.0/Entry/entry-border-active-notebook.png
+++ b/themes/Adwaita/gtk-2.0/Entry/entry-border-active-notebook.png
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 00000000..4fd41cdb
--- /dev/null
+++ b/themes/Adwaita/gtk-2.0/Entry/entry-border-bg-solid.png
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 4fd41cdb..3a492dac 100644
--- a/themes/Adwaita/gtk-2.0/Entry/entry-border-bg.png
+++ b/themes/Adwaita/gtk-2.0/Entry/entry-border-bg.png
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 c831b2b1..246f2fc5 100644
--- a/themes/Adwaita/gtk-2.0/Entry/entry-border-notebook.png
+++ b/themes/Adwaita/gtk-2.0/Entry/entry-border-notebook.png
diff --git a/themes/Adwaita/gtk-2.0/Makefile.am b/themes/Adwaita/gtk-2.0/Makefile.am
index 8f24473d..214ef93e 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 b00d6f8e..27d36561 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
+        }
         }
 }