From 543d5a9a26acd8c3f2c7e89a63c5d58b5c8cfef0 Mon Sep 17 00:00:00 2001
From: Horst3180
Date: Mon, 30 May 2016 22:35:54 +0200
Subject: gtk2: fix entry styling (fix #547)

---
 .../menubar-toolbar/entry-active-toolbar-dark.png  | Bin 0 -> 280 bytes
 .../menubar-toolbar/entry-active-toolbar.png       | Bin 0 -> 276 bytes
 .../entry-disabled-toolbar-dark.png                | Bin 0 -> 250 bytes
 .../menubar-toolbar/entry-disabled-toolbar.png     | Bin 0 -> 251 bytes
 .../gtk-2.0/menubar-toolbar/entry-toolbar-dark.png | Bin 0 -> 267 bytes
 common/gtk-2.0/menubar-toolbar/entry-toolbar.png   | Bin 0 -> 247 bytes
 .../menubar-toolbar/menubar-toolbar-dark.rc        |  42 ++++++---------------
 common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc  |  42 +++++----------------
 .../toolbar-entry-border-active-bg-dark.png        | Bin 409 -> 0 bytes
 .../toolbar-entry-border-active-bg.png             | Bin 391 -> 0 bytes
 .../toolbar-entry-border-bg-dark.png               | Bin 352 -> 0 bytes
 .../menubar-toolbar/toolbar-entry-border-bg.png    | Bin 366 -> 0 bytes
 .../toolbar-entry-border-disabled-bg-dark.png      | Bin 321 -> 0 bytes
 .../toolbar-entry-border-disabled-bg.png           | Bin 321 -> 0 bytes
 14 files changed, 20 insertions(+), 64 deletions(-)
 create mode 100644 common/gtk-2.0/menubar-toolbar/entry-active-toolbar-dark.png
 create mode 100644 common/gtk-2.0/menubar-toolbar/entry-active-toolbar.png
 create mode 100644 common/gtk-2.0/menubar-toolbar/entry-disabled-toolbar-dark.png
 create mode 100644 common/gtk-2.0/menubar-toolbar/entry-disabled-toolbar.png
 create mode 100644 common/gtk-2.0/menubar-toolbar/entry-toolbar-dark.png
 create mode 100644 common/gtk-2.0/menubar-toolbar/entry-toolbar.png
 delete mode 100644 common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg-dark.png
 delete mode 100644 common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg.png
 delete mode 100644 common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg-dark.png
 delete mode 100644 common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg.png
 delete mode 100644 common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg-dark.png
 delete mode 100644 common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg.png

(limited to 'common/gtk-2.0/menubar-toolbar')

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
Binary files /dev/null and b/common/gtk-2.0/menubar-toolbar/entry-active-toolbar-dark.png differ
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
Binary files /dev/null and b/common/gtk-2.0/menubar-toolbar/entry-active-toolbar.png differ
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
Binary files /dev/null and b/common/gtk-2.0/menubar-toolbar/entry-disabled-toolbar-dark.png differ
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
Binary files /dev/null and b/common/gtk-2.0/menubar-toolbar/entry-disabled-toolbar.png differ
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
Binary files /dev/null and b/common/gtk-2.0/menubar-toolbar/entry-toolbar-dark.png differ
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
Binary files /dev/null and b/common/gtk-2.0/menubar-toolbar/entry-toolbar.png differ
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
Binary files a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg-dark.png and /dev/null differ
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
Binary files a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg.png and /dev/null differ
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
Binary files a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg-dark.png and /dev/null differ
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
Binary files a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg.png and /dev/null differ
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
Binary files a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg-dark.png and /dev/null differ
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
Binary files a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg.png and /dev/null differ
-- 
cgit v1.2.3