Tweaked tabs.

Active label is now blue, others are normal so they don't look inactive
anymore, and the blue underline is over the frame as in gtk3 and the
menubars.

6 files changed, 58 insertions, 16 deletions

diff --git a/themes/Adwaita/gtk-2.0/assets.svg b/themes/Adwaita/gtk-2.0/assets.svg
index 6a9c1c59..cc79c7a3 100644
--- a/themes/Adwaita/gtk-2.0/assets.svg
+++ b/themes/Adwaita/gtk-2.0/assets.svg
@@ -1435,9 +1435,9 @@
      borderopacity="1"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="45.254831"
-     inkscape:cx="12.903112"
-     inkscape:cy="250.40377"
+     inkscape:zoom="63.999996"
+     inkscape:cx="8.7836696"
+     inkscape:cy="247.62203"
      inkscape:current-layer="layer1"
      inkscape:document-units="px"
      showgrid="false"
@@ -5725,7 +5725,7 @@
          y="232.00006"
          x="10"
          height="1"
-         width="3"
+         width="2"
          id="rect5142"
          style="opacity:1;fill:#4a90d9;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
@@ -5745,7 +5745,7 @@
          y="232"
          x="10"
          height="1"
-         width="3"
+         width="2"
          id="rect5216"
          style="opacity:1;fill:#4a90d9;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
@@ -5757,5 +5757,13 @@
        x="213"
        y="17"
        inkscape:label="#rect4938" />
+    <rect
+       inkscape:label="#rect5015"
+       y="232"
+       x="12"
+       height="1"
+       width="1"
+       id="tab-gap"
+       style="opacity:1;fill:#4a90d9;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   </g>
 </svg>
diff --git a/themes/Adwaita/gtk-2.0/assets.txt b/themes/Adwaita/gtk-2.0/assets.txt
index 0cea547e..09b8cea4 100644
--- a/themes/Adwaita/gtk-2.0/assets.txt
+++ b/themes/Adwaita/gtk-2.0/assets.txt
@@ -116,3 +116,4 @@ scale-vert-trough
 scale-vert-trough-active
 tab-horz-active
 tab-vert-active
+tab-gap
diff --git a/themes/Adwaita/gtk-2.0/assets/tab-gap.png b/themes/Adwaita/gtk-2.0/assets/tab-gap.png
new file mode 100644
index 00000000..c82a63a6
--- /dev/null
+++ b/themes/Adwaita/gtk-2.0/assets/tab-gap.png
diff --git a/themes/Adwaita/gtk-2.0/assets/tab-horz-active.png b/themes/Adwaita/gtk-2.0/assets/tab-horz-active.png
index 1692257f..e019815b 100644
--- a/themes/Adwaita/gtk-2.0/assets/tab-horz-active.png
+++ b/themes/Adwaita/gtk-2.0/assets/tab-horz-active.png
diff --git a/themes/Adwaita/gtk-2.0/assets/tab-vert-active.png b/themes/Adwaita/gtk-2.0/assets/tab-vert-active.png
index 96182e7b..12d32c8e 100644
--- a/themes/Adwaita/gtk-2.0/assets/tab-vert-active.png
+++ b/themes/Adwaita/gtk-2.0/assets/tab-vert-active.png
diff --git a/themes/Adwaita/gtk-2.0/main.rc b/themes/Adwaita/gtk-2.0/main.rc
index cba479d4..de338aa3 100644
--- a/themes/Adwaita/gtk-2.0/main.rc
+++ b/themes/Adwaita/gtk-2.0/main.rc
@@ -1646,7 +1646,7 @@ style "notebook" {
     image {
       function = EXTENSION
       file     = "assets/tab-vert-active.png"
-      border   = {0, 3, 0, 0}
+      border   = {0, 2, 0, 0}
       stretch  = TRUE
       gap_side = RIGHT
     }
@@ -1663,7 +1663,7 @@ style "notebook" {
     image {
       function = EXTENSION
       file     = "assets/tab-vert-active.png"
-      border   = {3, 0, 0, 0}
+      border   = {2, 0, 0, 0}
       stretch  = TRUE
       gap_side = LEFT
     }
@@ -1680,7 +1680,7 @@ style "notebook" {
     image {
       function = EXTENSION
       file     = "assets/tab-horz-active.png"
-      border   = {0, 0, 0, 3}
+      border   = {0, 0, 0, 2}
       stretch  = TRUE
       gap_side = BOTTOM
     }
@@ -1697,7 +1697,7 @@ style "notebook" {
     image {
       function = EXTENSION
       file     = "assets/tab-horz-active.png"
-      border   = {0, 0, 3, 0}
+      border   = {0, 0, 2, 0}
       stretch  = TRUE
       gap_side = TOP
     }
@@ -1705,12 +1705,45 @@ style "notebook" {
     # Draw the inner frame
 
     image {
-      function = BOX_GAP
-      file     = "assets/frame-notebook.png"
-      border   = {1, 1, 1, 1}
-      stretch  = TRUE
-    }
-
+      function   = BOX_GAP
+      file       = "assets/frame-notebook.png"
+      border     = {1, 1, 1, 1}
+      stretch    = TRUE
+      gap_file   = "assets/tab-gap.png"
+      gap_border = {1, 0, 0, 0}
+      gap_side   = LEFT
+    }
+    
+    image {
+      function   = BOX_GAP
+      file       = "assets/frame-notebook.png"
+      border     = {1, 1, 1, 1}
+      stretch    = TRUE
+      gap_file   = "assets/tab-gap.png"
+      gap_border = {0, 1, 0, 0}
+      gap_side   = RIGHT
+    }
+    
+    image {
+      function   = BOX_GAP
+      file       = "assets/frame-notebook.png"
+      border     = {1, 1, 1, 1}
+      stretch    = TRUE
+      gap_file   = "assets/tab-gap.png"
+      gap_border = {0, 0, 1, 0}
+      gap_side   = TOP
+    }
+    
+    image {
+      function   = BOX_GAP
+      file       = "assets/frame-notebook.png"
+      border     = {1, 1, 1, 1}
+      stretch    = TRUE
+      gap_file   = "assets/tab-gap.png"
+      gap_border = {0, 0, 0, 1}
+      gap_side   = BOTTOM
+    }
+    
     # Standalone frame
 
     image {
@@ -1728,7 +1761,7 @@ style "notebook_tab_label" {
 
   font_name = "Bold"
   # Again, ACTIVE is actually inactive
-  fg[ACTIVE] = mix(0.5, @fg_color, @bg_color)
+  fg[NORMAL] = @selected_bg_color
 
 }