gtk2: fix entry styling (fix #547)

14 files changed, 20 insertions, 64 deletions

diff --git a/common/gtk-2.0/menubar-toolbar/entry-active-toolbar-dark.png b/common/gtk-2.0/menubar-toolbar/entry-active-toolbar-dark.png
new file mode 100644
index 0000000..ac880fb
--- /dev/null
+++ b/common/gtk-2.0/menubar-toolbar/entry-active-toolbar-dark.png
diff --git a/common/gtk-2.0/menubar-toolbar/entry-active-toolbar.png b/common/gtk-2.0/menubar-toolbar/entry-active-toolbar.png
new file mode 100644
index 0000000..359b399
--- /dev/null
+++ b/common/gtk-2.0/menubar-toolbar/entry-active-toolbar.png
diff --git a/common/gtk-2.0/menubar-toolbar/entry-disabled-toolbar-dark.png b/common/gtk-2.0/menubar-toolbar/entry-disabled-toolbar-dark.png
new file mode 100644
index 0000000..d6f19b7
--- /dev/null
+++ b/common/gtk-2.0/menubar-toolbar/entry-disabled-toolbar-dark.png
diff --git a/common/gtk-2.0/menubar-toolbar/entry-disabled-toolbar.png b/common/gtk-2.0/menubar-toolbar/entry-disabled-toolbar.png
new file mode 100644
index 0000000..074826b
--- /dev/null
+++ b/common/gtk-2.0/menubar-toolbar/entry-disabled-toolbar.png
diff --git a/common/gtk-2.0/menubar-toolbar/entry-toolbar-dark.png b/common/gtk-2.0/menubar-toolbar/entry-toolbar-dark.png
new file mode 100644
index 0000000..5c04ca3
--- /dev/null
+++ b/common/gtk-2.0/menubar-toolbar/entry-toolbar-dark.png
diff --git a/common/gtk-2.0/menubar-toolbar/entry-toolbar.png b/common/gtk-2.0/menubar-toolbar/entry-toolbar.png
new file mode 100644
index 0000000..885a5d8
--- /dev/null
+++ b/common/gtk-2.0/menubar-toolbar/entry-toolbar.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 122443c..4ebb209 100644
--- a/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc
+++ b/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc
@@ -126,9 +126,9 @@ style "toolbar_button" {
 }
 
 style "toolbar_entry" {
-  xthickness = 6
 
-  base[NORMAL] = "#414857"
+  base[NORMAL] = "#404552"
+  base[ACTIVE] = "#404552"
   base[INSENSITIVE] = "#39404d"
 
   text[NORMAL] = "#afb8c5"
@@ -137,50 +137,30 @@ style "toolbar_entry" {
 
     image {
       function = SHADOW
-      detail = "entry"
       state = NORMAL
-      shadow = IN
-      file = "menubar-toolbar/toolbar-entry-border-bg-dark.png"
-      border = { 12, 12, 12, 12 }
+      detail = "entry"
+      file = "menubar-toolbar/entry-toolbar-dark.png"
+      border = {6, 6, 6, 6}
       stretch = TRUE
     }
 
     image {
       function = SHADOW
+      state = ACTIVE
       detail = "entry"
-      state = INSENSITIVE
-      shadow = IN
-      file = "menubar-toolbar/toolbar-entry-border-disabled-bg-dark.png"
-      border = { 12, 12, 12, 12 }
+      file = "menubar-toolbar/entry-active-toolbar-dark.png"
+      border = {6, 6, 6, 6}
       stretch = TRUE
     }
 
     image {
       function = SHADOW
+      state = INSENSITIVE
       detail = "entry"
-      state = ACTIVE
-      file = "menubar-toolbar/toolbar-entry-border-active-bg-dark.png"
-      border = { 12, 12, 12, 12 }
+      file = "menubar-toolbar/entry-disabled-toolbar-dark.png"
+      border = {6, 6, 6, 6}
       stretch = TRUE
     }
-
-    image {
-      function = FLAT_BOX
-      detail = "entry_bg"
-      state = NORMAL
-      overlay_file = "assets/null.png"
-      overlay_border = { 0, 0, 0, 0 }
-      overlay_stretch = TRUE
-    }
-
-    image {
-      function = FLAT_BOX
-      detail = "entry_bg"
-      state = ACTIVE
-      overlay_file = "assets/null.png"
-      overlay_border = { 0, 0, 0, 0 }
-      overlay_stretch = TRUE
-    }
   }
 }
 
diff --git a/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc b/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc
index c02626d..5a9f177 100644
--- a/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc
+++ b/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc
@@ -71,10 +71,6 @@ style "menubar-text" {
 }
 
 style "toolbar_entry" {
-  xthickness = 6
-
-  base[NORMAL] = "#fdfdfd"
-  base[INSENSITIVE] = "#f4f5f6"
 
   text[NORMAL] = "#70788d"
 
@@ -82,50 +78,30 @@ style "toolbar_entry" {
 
     image {
       function = SHADOW
-      detail = "entry"
       state = NORMAL
-      shadow = IN
-      file = "menubar-toolbar/toolbar-entry-border-bg.png"
-      border = { 12, 12, 12, 12 }
+      detail = "entry"
+      file = "menubar-toolbar/entry-toolbar.png"
+      border = {6, 6, 6, 6}
       stretch = TRUE
     }
 
     image {
       function = SHADOW
+      state = ACTIVE
       detail = "entry"
-      state = INSENSITIVE
-      shadow = IN
-      file = "menubar-toolbar/toolbar-entry-border-disabled-bg.png"
-      border = { 12, 12, 12, 12 }
+      file = "menubar-toolbar/entry-active-toolbar.png"
+      border = {6, 6, 6, 6}
       stretch = TRUE
     }
 
     image {
       function = SHADOW
+      state = INSENSITIVE
       detail = "entry"
-      state = ACTIVE
-      file = "menubar-toolbar/toolbar-entry-border-active-bg.png"
-      border = { 12, 12, 12, 12 }
+      file = "menubar-toolbar/entry-disabled-toolbar.png"
+      border = {6, 6, 6, 6}
       stretch = TRUE
     }
-
-    image {
-      function = FLAT_BOX
-      detail = "entry_bg"
-      state = NORMAL
-      overlay_file = "assets/null.png"
-      overlay_border = { 0, 0, 0, 0 }
-      overlay_stretch = TRUE
-    }
-
-    image {
-      function = FLAT_BOX
-      detail = "entry_bg"
-      state = ACTIVE
-      overlay_file = "assets/null.png"
-      overlay_border = { 0, 0, 0, 0 }
-      overlay_stretch = TRUE
-    }
   }
 }
 
diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg-dark.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg-dark.png
deleted file mode 100644
index 4c358b3..0000000
--- a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg-dark.png
+++ /dev/null
diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg.png
deleted file mode 100644
index 427548a..0000000
--- a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg.png
+++ /dev/null
diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg-dark.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg-dark.png
deleted file mode 100644
index 716060a..0000000
--- a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg-dark.png
+++ /dev/null
diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg.png
deleted file mode 100644
index 320deb9..0000000
--- a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg.png
+++ /dev/null
diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg-dark.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg-dark.png
deleted file mode 100644
index 8304a5d..0000000
--- a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg-dark.png
+++ /dev/null
diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg.png
deleted file mode 100644
index 512d5bd..0000000
--- a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg.png
+++ /dev/null