gtk2: more entry fixes

11 files changed, 119 insertions, 19 deletions

diff --git a/common/gtk-2.0/apps.rc b/common/gtk-2.0/apps.rc
index ecabed7..fc010cf 100644
--- a/common/gtk-2.0/apps.rc
+++ b/common/gtk-2.0/apps.rc
@@ -56,20 +56,22 @@ style "entry_border" {
 
     image {
       function = FLAT_BOX
-      detail = "entry_bg"
-      state = NORMAL
-      overlay_file = "assets/null.png"
-      overlay_border = { 0, 0, 0, 0 }
-      overlay_stretch = TRUE
+      state    = ACTIVE
+      detail   = "entry_bg"
+      file     = "assets/null.png"
     }
 
     image {
       function = FLAT_BOX
-      detail = "entry_bg"
-      state = ACTIVE
-      overlay_file = "assets/null.png"
-      overlay_border = { 0, 0, 0, 0 }
-      overlay_stretch = TRUE
+      state    = INSENSITIVE
+      detail   = "entry_bg"
+      file     = "assets/null.png"
+    }
+
+    image {
+      function = FLAT_BOX
+      detail   = "entry_bg"
+      file     = "assets/null.png"
     }
   }
 }
diff --git a/common/gtk-2.0/assets-dark.svg b/common/gtk-2.0/assets-dark.svg
index 20aeedd..41c9339 100644
--- a/common/gtk-2.0/assets-dark.svg
+++ b/common/gtk-2.0/assets-dark.svg
@@ -566,8 +566,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="-24.583201"
-     inkscape:cy="377.40868"
+     inkscape:cx="84.915241"
+     inkscape:cy="372.56435"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -5672,5 +5672,25 @@
          id="rect7903-7-3-7-7"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
+    <rect
+       style="display:inline;opacity:1;fill:#404552;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="entry-background"
+       width="6"
+       height="18"
+       x="66"
+       y="-244.63782"
+       rx="2.7755599e-17"
+       ry="2.7755599e-17"
+       inkscape:label="#rect5008" />
+    <rect
+       style="display:inline;opacity:1;fill:#3e4350;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="entry-background-disabled"
+       width="6"
+       height="18"
+       x="79"
+       y="-244.63782"
+       rx="2.7755599e-17"
+       ry="2.7755599e-17"
+       inkscape:label="#rect5008-1" />
   </g>
 </svg>
diff --git a/common/gtk-2.0/assets-dark/entry-background-disabled.png b/common/gtk-2.0/assets-dark/entry-background-disabled.png
new file mode 100644
index 0000000..06e5598
--- /dev/null
+++ b/common/gtk-2.0/assets-dark/entry-background-disabled.png
diff --git a/common/gtk-2.0/assets-dark/entry-background.png b/common/gtk-2.0/assets-dark/entry-background.png
new file mode 100644
index 0000000..f20e160
--- /dev/null
+++ b/common/gtk-2.0/assets-dark/entry-background.png
diff --git a/common/gtk-2.0/assets.svg b/common/gtk-2.0/assets.svg
index e8b23d8..cf942b4 100644
--- a/common/gtk-2.0/assets.svg
+++ b/common/gtk-2.0/assets.svg
@@ -565,9 +565,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="-25.898322"
-     inkscape:cy="369.44312"
+     inkscape:zoom="7.9999996"
+     inkscape:cx="68.971701"
+     inkscape:cy="353.39299"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -5640,5 +5640,25 @@
          id="rect7903-7-3-7-7"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="entry-background"
+       width="6"
+       height="18"
+       x="67"
+       y="-245.63782"
+       rx="2.7755599e-17"
+       ry="2.7755599e-17"
+       inkscape:label="#rect5008" />
+    <rect
+       style="display:inline;opacity:1;fill:#fbfcfc;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="entry-background-disabled"
+       width="6"
+       height="18"
+       x="80"
+       y="-245.63782"
+       rx="2.7755599e-17"
+       ry="2.7755599e-17"
+       inkscape:label="#rect5008-1" />
   </g>
 </svg>
diff --git a/common/gtk-2.0/assets.txt b/common/gtk-2.0/assets.txt
index 8ebc233..853a182 100644
--- a/common/gtk-2.0/assets.txt
+++ b/common/gtk-2.0/assets.txt
@@ -42,6 +42,8 @@ menu-radio-checked-insensitive
 menu-radio-unchecked
 menu-radio-unchecked-selected
 menu-radio-unchecked-insensitive
+entry-background
+entry-background-disabled
 entry-border-bg
 entry-border-active-bg
 entry-bg
diff --git a/common/gtk-2.0/assets/entry-background-disabled.png b/common/gtk-2.0/assets/entry-background-disabled.png
new file mode 100644
index 0000000..6b2c6b9
--- /dev/null
+++ b/common/gtk-2.0/assets/entry-background-disabled.png
diff --git a/common/gtk-2.0/assets/entry-background.png b/common/gtk-2.0/assets/entry-background.png
new file mode 100644
index 0000000..5914b3f
--- /dev/null
+++ b/common/gtk-2.0/assets/entry-background.png
diff --git a/common/gtk-2.0/main.rc b/common/gtk-2.0/main.rc
index 1d22cbb..24b5ca7 100644
--- a/common/gtk-2.0/main.rc
+++ b/common/gtk-2.0/main.rc
@@ -980,10 +980,6 @@ style "entry" {
   xthickness = 6
   ythickness = 4
 
-  base[NORMAL] = @base_color
-  base[ACTIVE] = @base_color
-  base[INSENSITIVE] = @insensitive_bg_color
-
   engine "pixmap" {
 
     image {
@@ -1012,6 +1008,26 @@ style "entry" {
       border = {6, 6, 6, 6}
       stretch = TRUE
     }
+
+    image {
+      function = FLAT_BOX
+      state    = ACTIVE
+      detail   = "entry_bg"
+      file     = "assets/entry-background.png"
+    }
+
+    image {
+      function = FLAT_BOX
+      state    = INSENSITIVE
+      detail   = "entry_bg"
+      file     = "assets/entry-background-disabled.png"
+    }
+
+    image {
+      function = FLAT_BOX
+      detail   = "entry_bg"
+      file     = "assets/entry-background.png"
+    }
   }
 }
 
diff --git a/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc b/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc
index 4ebb209..baf7f44 100644
--- a/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc
+++ b/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc
@@ -161,6 +161,26 @@ style "toolbar_entry" {
       border = {6, 6, 6, 6}
       stretch = TRUE
     }
+
+    image {
+      function = FLAT_BOX
+      state    = ACTIVE
+      detail   = "entry_bg"
+      file     = "assets/null.png"
+    }
+
+    image {
+      function = FLAT_BOX
+      state    = INSENSITIVE
+      detail   = "entry_bg"
+      file     = "assets/null.png"
+    }
+
+    image {
+      function = FLAT_BOX
+      detail   = "entry_bg"
+      file     = "assets/null.png"
+    }
   }
 }
 
diff --git a/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc b/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc
index 5a9f177..4cb89eb 100644
--- a/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc
+++ b/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc
@@ -102,6 +102,26 @@ style "toolbar_entry" {
       border = {6, 6, 6, 6}
       stretch = TRUE
     }
+
+    image {
+      function = FLAT_BOX
+      state    = ACTIVE
+      detail   = "entry_bg"
+      file     = "assets/null.png"
+    }
+
+    image {
+      function = FLAT_BOX
+      state    = INSENSITIVE
+      detail   = "entry_bg"
+      file     = "assets/null.png"
+    }
+
+    image {
+      function = FLAT_BOX
+      detail   = "entry_bg"
+      file     = "assets/null.png"
+    }
   }
 }