[gnome-themes-standard/wip/jimmac/updated-gtk2: 49/106] Further tweaked padding, updated scrollbars.

[Jakub Steiner <jimmac src gnome org>]

commit e51395026d647ce70bb3f0a5359cbc76b3031bc6
Author: Juraj Fiala <doctorjellyface riseup net>
Date:   Tue Feb 9 16:46:31 2016 +0100

    Further tweaked padding, updated scrollbars.

 themes/Adwaita/gtk-2.0/assets.svg                  |   81 +++++++------------
 .../gtk-2.0/assets/progressbar-horz-trough.png     |  Bin 364 -> 343 bytes
 themes/Adwaita/gtk-2.0/assets/progressbar-horz.png |  Bin 284 -> 275 bytes
 .../gtk-2.0/assets/progressbar-vert-trough.png     |  Bin 379 -> 351 bytes
 themes/Adwaita/gtk-2.0/assets/progressbar-vert.png |  Bin 293 -> 284 bytes
 themes/Adwaita/gtk-2.0/main.rc                     |   40 ++++++----
 6 files changed, 53 insertions(+), 68 deletions(-)
---
diff --git a/themes/Adwaita/gtk-2.0/assets.svg b/themes/Adwaita/gtk-2.0/assets.svg
index 1a73abb..4143332 100644
--- a/themes/Adwaita/gtk-2.0/assets.svg
+++ b/themes/Adwaita/gtk-2.0/assets.svg
@@ -1558,26 +1558,6 @@
        y1="28.387304"
        x2="5.0000005"
        y2="3.6127" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4962"
-       id="linearGradient5049"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(30,0)"
-       x1="5.0000005"
-       y1="6.9609089"
-       x2="5.0000005"
-       y2="2.0659039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4962"
-       id="linearGradient5155"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(30,0)"
-       x1="5.0000005"
-       y1="6.9609089"
-       x2="5.0000005"
-       y2="2.0659039" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -1586,9 +1566,9 @@
      borderopacity="1"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="45.254832"
-     inkscape:cx="211.70163"
-     inkscape:cy="459.50679"
+     inkscape:zoom="15.999999"
+     inkscape:cx="141.71315"
+     inkscape:cy="441.76958"
      inkscape:current-layer="layer1"
      inkscape:document-units="px"
      showgrid="false"
@@ -5452,7 +5432,7 @@
          id="g5043"
          transform="translate(107,7)">
         <rect
-           
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5049);fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+           
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#cececc;fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
            id="rect5045"
            width="7"
            height="6"
@@ -5473,14 +5453,14 @@
     </g>
     <g
        id="progressbar-horz"
-       inkscape:label="#g5113">
+       inkscape:label="#g5033">
       <rect
          ry="0"
          rx="0"
-         y="67"
-         x="135"
-         height="10"
-         width="10"
+         y="68"
+         x="136"
+         height="8"
+         width="8"
          id="rect5097"
          
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
 />
       <g
@@ -5489,7 +5469,7 @@
         <rect
            ry="3"
            rx="3"
-           y="1.5"
+           y="0.5"
            x="31.5"
            height="6"
            width="7"
@@ -5498,30 +5478,30 @@
         <rect
            ry="3"
            rx="3"
-           y="1.5"
+           y="0.5"
            x="31.5"
            height="6"
            width="7"
            id="rect5103"
-           
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#9d9d99;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
 />
+           
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#184472;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
 />
       </g>
     </g>
     <g
-       inkscape:label="#g5113"
        id="progressbar-vert"
-       transform="matrix(0,-1,1,0,80,212)">
+       inkscape:label="#g5023">
       <rect
+         transform="matrix(0,-1,1,0,0,0)"
          
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
          id="rect5135"
-         width="10"
-         height="10"
-         x="135"
-         y="67"
+         width="9"
+         height="7"
+         x="-77"
+         y="149"
          rx="0"
          ry="0" />
       <g
          id="g5137"
-         transform="translate(105,68)">
+         transform="matrix(0,-1,1,0,148,107)">
         <rect
            
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4a90d9;fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
            id="rect5139"
@@ -5532,7 +5512,7 @@
            rx="3"
            ry="3" />
         <rect
-           
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#9d9d99;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
+           
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#184472;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
            id="rect5141"
            width="7"
            height="6"
@@ -5543,14 +5523,13 @@
       </g>
     </g>
     <g
-       transform="translate(12,22)"
-       inkscape:label="#g5060"
-       id="progressbar-vert-trough">
+       id="progressbar-vert-trough"
+       inkscape:label="#g5002">
       <rect
          ry="3"
          rx="3"
-         y="9.5"
-         x="138.5"
+         y="31.5"
+         x="150.5"
          height="7"
          width="6"
          id="rect5145"
@@ -5558,14 +5537,14 @@
       <rect
          ry="0"
          rx="0"
-         y="7"
-         x="137"
-         height="10"
-         width="10"
+         y="29"
+         x="149"
+         height="11"
+         width="9"
          id="rect5147"
          
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
 />
       <g
-         transform="translate(107,7)"
+         transform="translate(119,29)"
          id="g5149">
         <rect
            ry="3"
@@ -5575,7 +5554,7 @@
            height="7"
            width="6"
            id="rect5151"
-           
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5155);fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
 />
+           
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#cececc;fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
 />
         <rect
            ry="3"
            rx="3"
diff --git a/themes/Adwaita/gtk-2.0/assets/progressbar-horz-trough.png 
b/themes/Adwaita/gtk-2.0/assets/progressbar-horz-trough.png
index 5af7639..7c1146f 100644
Binary files a/themes/Adwaita/gtk-2.0/assets/progressbar-horz-trough.png and 
b/themes/Adwaita/gtk-2.0/assets/progressbar-horz-trough.png differ
diff --git a/themes/Adwaita/gtk-2.0/assets/progressbar-horz.png 
b/themes/Adwaita/gtk-2.0/assets/progressbar-horz.png
index 290a1b1..bc2be0d 100644
Binary files a/themes/Adwaita/gtk-2.0/assets/progressbar-horz.png and 
b/themes/Adwaita/gtk-2.0/assets/progressbar-horz.png differ
diff --git a/themes/Adwaita/gtk-2.0/assets/progressbar-vert-trough.png 
b/themes/Adwaita/gtk-2.0/assets/progressbar-vert-trough.png
index f7f91c0..107da4d 100644
Binary files a/themes/Adwaita/gtk-2.0/assets/progressbar-vert-trough.png and 
b/themes/Adwaita/gtk-2.0/assets/progressbar-vert-trough.png differ
diff --git a/themes/Adwaita/gtk-2.0/assets/progressbar-vert.png 
b/themes/Adwaita/gtk-2.0/assets/progressbar-vert.png
index 730f9bd..494a8fd 100644
Binary files a/themes/Adwaita/gtk-2.0/assets/progressbar-vert.png and 
b/themes/Adwaita/gtk-2.0/assets/progressbar-vert.png differ
diff --git a/themes/Adwaita/gtk-2.0/main.rc b/themes/Adwaita/gtk-2.0/main.rc
index 59435a8..66a032e 100644
--- a/themes/Adwaita/gtk-2.0/main.rc
+++ b/themes/Adwaita/gtk-2.0/main.rc
@@ -37,9 +37,10 @@ style "default" {
 
   GtkButton::default-border         = {0, 0, 0, 0}
   GtkButton::default-outside-border = {0, 0, 0, 0}
-  GtkButton::inner-border           = {5, 5, 2, 3}
+  GtkButton::inner-border           = {5, 5, 3, 3}
 
   GtkEntry::state-hint = 1
+  GtkEntry::inner-border = {7, 7, 4, 5}
 
   GtkScrollbar::trough-border = 0
   GtkRange::trough-border     = 0
@@ -53,10 +54,19 @@ style "default" {
   GtkScrolledWindow::scrollbar-spacing       = 0
   GtkScrolledWindow::scrollbars-within-bevel = 1
 
-  GtkVScale::slider_length = 16
-  GtkVScale::slider_width  = 16
-  GtkHScale::slider_length = 16
-  GtkHScale::slider_width  = 16
+  GtkScale::slider_length = 20
+  GtkScale::slider_width  = 26
+
+  # FIXME: progress bars should be 2px smaller, but doing so now makes
+  #        them fuzzy, it probably requires a change in the assets.
+  GtkProgressBar::min-horizontal-bar-height = 9
+  GtkProgressBar::min-vertical-bar-width    = 8
+  # Making this bigger than the min[height,width]-2*[y,x]spacing makes the
+  # whole progressbar thicker, so by setting it to the exact above value
+  # we get the maximum spacing between the text and the edges without
+  # doing so.
+  GtkProgressBar::xspacing = 6
+  GtkProgressBar::yspacing = 7
 
   GtkStatusbar::shadow_type    = GTK_SHADOW_NONE
   GtkSpinButton::shadow_type   = GTK_SHADOW_NONE
@@ -1128,7 +1138,7 @@ style "checkbutton" {
 style "entry" {
 
   xthickness = 3
-  ythickness = 4
+  ythickness = 3
 
   # This is needed otherwise the background is drawn with fg
   base[INSENSITIVE] = @insensitive_bg_color
@@ -1190,9 +1200,6 @@ style "notebook_tab_label" {
 
 style "combobox_entry" {
 
-  xthickness = 2
-  ythickness = 4
-
   engine "pixmap" {
 
     ###############
@@ -1363,9 +1370,6 @@ style "combobox_entry_button" {
 
 style "spinbutton" {
 
-  xthickness = 4
-  ythickness = 4
-
   engine "pixmap" {
 
     image {
@@ -1962,13 +1966,15 @@ style "progressbar" {
   xthickness = 1
   ythickness = 1
 
+  fg[PRELIGHT] = @selected_fg_color
+
   engine "pixmap" {
 
     image {
       function    = BOX
       detail      = "trough"
       file        = "assets/progressbar-horz-trough.png"
-      border      = {4, 4, 0, 10}
+      border      = {4, 4, 4, 5}
       stretch     = TRUE
       orientation = HORIZONTAL
     }
@@ -1978,7 +1984,7 @@ style "progressbar" {
       detail      = "bar"
       file        = "assets/progressbar-horz.png"
       stretch     = TRUE
-      border      = {3, 3, 0, 10}
+      border      = {3, 3, 3, 4}
       orientation = HORIZONTAL
     }
 
@@ -1986,7 +1992,7 @@ style "progressbar" {
       function    = BOX
       detail      = "trough"
       file        = "assets/progressbar-vert-trough.png"
-      border      = {0, 10, 4, 4}
+      border      = {4, 4, 4, 5}
       stretch     = TRUE
       orientation = VERTICAL
     }
@@ -1996,7 +2002,7 @@ style "progressbar" {
       detail      = "bar"
       file        = "assets/progressbar-vert.png"
       stretch     = TRUE
-      border      = {0, 10, 3, 3}
+      border      = {3, 3, 3, 4}
       orientation = VERTICAL
     }
 
@@ -2218,7 +2224,7 @@ style "toolbar" {
 
 style "toolbar_button" {
 
-  GtkButton::inner-border = {4, 4, 4, 4}
+  #GtkButton::inner-border = {4, 4, 4, 4}
   #xthickness = 4
   #ythickness = 4