Improve entries

Separate the background and the border in two different assets, and use
the "entry_bg" flat box to draw the fill.

9 files changed, 38 insertions, 8 deletions

diff --git a/themes/Adwaita/gtk-2.0/Entry/entry-active.png b/themes/Adwaita/gtk-2.0/Entry/entry-active.png
deleted file mode 100644
index 28050318..00000000
--- a/themes/Adwaita/gtk-2.0/Entry/entry-active.png
+++ /dev/null
diff --git a/themes/Adwaita/gtk-2.0/Entry/entry-bg-disabled.png b/themes/Adwaita/gtk-2.0/Entry/entry-bg-disabled.png
new file mode 100644
index 00000000..3ad139b1
--- /dev/null
+++ b/themes/Adwaita/gtk-2.0/Entry/entry-bg-disabled.png
diff --git a/themes/Adwaita/gtk-2.0/Entry/entry-bg.png b/themes/Adwaita/gtk-2.0/Entry/entry-bg.png
new file mode 100644
index 00000000..f03ff720
--- /dev/null
+++ b/themes/Adwaita/gtk-2.0/Entry/entry-bg.png
diff --git a/themes/Adwaita/gtk-2.0/Entry/entry-border-active.png b/themes/Adwaita/gtk-2.0/Entry/entry-border-active.png
new file mode 100644
index 00000000..61eb5b47
--- /dev/null
+++ b/themes/Adwaita/gtk-2.0/Entry/entry-border-active.png
diff --git a/themes/Adwaita/gtk-2.0/Entry/entry-border-disabled.png b/themes/Adwaita/gtk-2.0/Entry/entry-border-disabled.png
new file mode 100644
index 00000000..307c5672
--- /dev/null
+++ b/themes/Adwaita/gtk-2.0/Entry/entry-border-disabled.png
diff --git a/themes/Adwaita/gtk-2.0/Entry/entry-border.png b/themes/Adwaita/gtk-2.0/Entry/entry-border.png
new file mode 100644
index 00000000..22587b4b
--- /dev/null
+++ b/themes/Adwaita/gtk-2.0/Entry/entry-border.png
diff --git a/themes/Adwaita/gtk-2.0/Entry/entry.png b/themes/Adwaita/gtk-2.0/Entry/entry.png
deleted file mode 100644
index 26362094..00000000
--- a/themes/Adwaita/gtk-2.0/Entry/entry.png
+++ /dev/null
diff --git a/themes/Adwaita/gtk-2.0/Makefile.am b/themes/Adwaita/gtk-2.0/Makefile.am
index 47d9261e..577af902 100644
--- a/themes/Adwaita/gtk-2.0/Makefile.am
+++ b/themes/Adwaita/gtk-2.0/Makefile.am
@@ -30,8 +30,11 @@ asset_data =
 	Check-Radio/menuoption_prelight.png \
 	Check-Radio/option1.png \
 	Check-Radio/option2.png \
-	Entry/entry.png \
-	Entry/entry-active.png \
+	Entry/entry-border.png \
+	Entry/entry-border-active.png \
+	Entry/entry-border-disabled.png \
+	Entry/entry-bg.png \
+	Entry/entry-bg-disabled.png \
 	Expanders/minus.png \
 	Expanders/plus.png \
 	Handles/handle-h.png \
diff --git a/themes/Adwaita/gtk-2.0/gtkrc b/themes/Adwaita/gtk-2.0/gtkrc
index a57a2522..aea11fa6 100755
--- a/themes/Adwaita/gtk-2.0/gtkrc
+++ b/themes/Adwaita/gtk-2.0/gtkrc
@@ -842,8 +842,8 @@ style "entry"
 		detail			= "entry"
                 state                   = NORMAL
 		shadow			= IN
-		file			= "Entry/entry.png"
-		border			= { 2, 2, 3, 3 }
+		file			= "Entry/entry-border.png"
+		border			= { 4, 4, 4, 4 }
 		stretch			= TRUE
 	}
 	image
@@ -852,8 +852,8 @@ style "entry"
 		detail			= "entry"
                 state                   = INSENSITIVE
 		shadow			= IN
-		file			= "Entry/entry.png"
-		border			= { 2, 2, 2, 2 }
+		file			= "Entry/entry-border-disabled.png"
+		border			= { 4, 4, 4, 4 }
 		stretch			= TRUE
 	}
         image
@@ -861,10 +861,37 @@ style "entry"
 		function		= SHADOW
 		detail			= "entry"
                 state                   = ACTIVE
-		file			= "Entry/entry-active.png"
-		border			= { 2, 2, 3, 3 }
+		file			= "Entry/entry-border-active.png"
+		border			= { 4, 4, 4, 4 }
 		stretch			= TRUE
         }
+        image
+        {
+                function                = FLAT_BOX
+                detail                  = "entry_bg"
+                state                   = NORMAL
+                file                    = "Entry/entry-bg.png"
+                border                  = { 0, 0, 0, 0 }
+                stretch                 = TRUE
+        }
+        image
+        {
+                function                = FLAT_BOX
+                detail                  = "entry_bg"
+                state                   = ACTIVE
+                file                    = "Entry/entry-bg.png"
+                border                  = { 0, 0, 0, 0 }
+                stretch                 = TRUE
+        }
+        image
+        {
+                function                = FLAT_BOX
+                detail                  = "entry_bg"
+                state                   = INSENSITIVE
+                file                    = "Entry/entry-bg-disabled.png"
+                border                  = { 0, 0, 0, 0 }
+                stretch                 = TRUE
+        }
     }
 }