Tweaked scales.

6 files changed, 103 insertions, 90 deletions

diff --git a/themes/Adwaita/gtk-2.0/assets.svg b/themes/Adwaita/gtk-2.0/assets.svg
index f53fe3ea..bc0cbd20 100644
--- a/themes/Adwaita/gtk-2.0/assets.svg
+++ b/themes/Adwaita/gtk-2.0/assets.svg
@@ -1605,9 +1605,9 @@
      borderopacity="1"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="15.999999"
-     inkscape:cx="141.80136"
-     inkscape:cy="435.80783"
+     inkscape:zoom="7.9999995"
+     inkscape:cx="319.54786"
+     inkscape:cy="366.5909"
      inkscape:current-layer="layer1"
      inkscape:document-units="px"
      showgrid="false"
@@ -1615,7 +1615,7 @@
      inkscape:snap-global="true"
      inkscape:snap-nodes="false"
      inkscape:window-width="1366"
-     inkscape:window-height="741"
+     inkscape:window-height="704"
      inkscape:window-x="0"
      inkscape:window-y="27"
      inkscape:window-maximized="1"
@@ -5691,89 +5691,20 @@
          ry="5.5" />
     </g>
     <g
-       id="scale-horz-trough"
-       inkscape:label="#g5377">
-      <rect
-         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="rect5041-5"
-         width="11"
-         height="26"
-         x="280"
-         y="94"
-         rx="0"
-         ry="0" />
-      <g
-         id="g5043-3"
-         transform="translate(252,102)">
-        <rect
-           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-2"
-           width="4"
-           height="3"
-           x="31.5"
-           y="3.5"
-           ry="1.5" />
-        <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"
-           id="use5047-1"
-           width="4"
-           height="3"
-           x="31.5"
-           y="3.5"
-           ry="1.5"
-           rx="0" />
-      </g>
-    </g>
-    <g
-       inkscape:label="#g5377"
-       id="scale-horz-trough-active"
-       transform="translate(22,0)">
-      <rect
-         ry="0"
-         rx="0"
-         y="94"
-         x="280"
-         height="26"
-         width="11"
-         id="rect5385"
-         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(252,102)"
-         id="g5387">
-        <rect
-           ry="1.5"
-           y="3.5"
-           x="31.5"
-           height="3"
-           width="4"
-           id="rect5389"
-           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4a90d9;fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-        <rect
-           rx="0"
-           ry="1.5"
-           y="3.5"
-           x="31.5"
-           height="3"
-           width="4"
-           id="rect5391"
-           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="#g5377"
        id="scale-vert-trough"
-       transform="matrix(0,1,-1,0,434.5,-186.5)">
+       inkscape:label="#g5121">
       <rect
+         transform="matrix(0,1,-1,0,0,0)"
          ry="0"
          rx="0"
-         y="94"
-         x="280"
+         y="-360.5"
+         x="81.5"
          height="26"
-         width="11"
+         width="23"
          id="rect5396"
          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(252,102)"
+         transform="matrix(0,1,-1,0,352.5,59.5)"
          id="g5398">
         <rect
            ry="1.5"
@@ -5795,21 +5726,21 @@
       </g>
     </g>
     <g
-       transform="matrix(0,1,-1,0,434.5,-174.5)"
        id="scale-vert-trough-active"
-       inkscape:label="#g5377">
+       inkscape:label="#g5131">
       <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="rect5406"
-         width="11"
+         width="23"
          height="26"
-         x="280"
-         y="94"
+         x="107.5"
+         y="-360.5"
          rx="0"
          ry="0" />
       <g
          id="g5408"
-         transform="translate(252,102)">
+         transform="matrix(0,1,-1,0,352.5,85.5)">
         <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="rect5410"
@@ -5894,5 +5825,87 @@
          y="-155"
          ry="1.3486539" />
     </g>
+    <g
+       id="scale-horz-trough"
+       inkscape:label="#g5084">
+      <rect
+         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="rect5041-5"
+         width="23"
+         height="26"
+         x="281"
+         y="94"
+         rx="0"
+         ry="0" />
+      <g
+         id="g5043-3"
+         transform="translate(255,102)">
+        <rect
+           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-2"
+           width="4"
+           height="3"
+           x="35.5"
+           y="3.5"
+           ry="1.5" />
+        <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"
+           id="use5047-1"
+           width="4"
+           height="3"
+           x="35.5"
+           y="3.5"
+           ry="1.5"
+           rx="0" />
+      </g>
+      <rect
+         y="106.89999"
+         x="281"
+         height="0.1"
+         width="0.1"
+         id="rect5082"
+         style="opacity:1;fill:#cccccc;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <g
+       id="scale-horz-trough-active"
+       inkscape:label="#g5110">
+      <rect
+         ry="0"
+         rx="0"
+         y="94"
+         x="312"
+         height="26"
+         width="23"
+         id="rect5385"
+         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(290,102)"
+         id="g5387">
+        <rect
+           ry="1.5"
+           y="3.5"
+           x="31.5"
+           height="3"
+           width="4"
+           id="rect5389"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4a90d9;fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+        <rect
+           rx="0"
+           ry="1.5"
+           y="3.5"
+           x="31.5"
+           height="3"
+           width="4"
+           id="rect5391"
+           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>
+      <rect
+         style="opacity:1;fill:#cccccc;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect5082-1"
+         width="0.1"
+         height="0.1"
+         x="312.4808"
+         y="107.21632" />
+    </g>
   </g>
 </svg>
diff --git a/themes/Adwaita/gtk-2.0/assets/scale-horz-trough-active.png b/themes/Adwaita/gtk-2.0/assets/scale-horz-trough-active.png
index d921a2e6..1628be22 100644
--- a/themes/Adwaita/gtk-2.0/assets/scale-horz-trough-active.png
+++ b/themes/Adwaita/gtk-2.0/assets/scale-horz-trough-active.png
diff --git a/themes/Adwaita/gtk-2.0/assets/scale-horz-trough.png b/themes/Adwaita/gtk-2.0/assets/scale-horz-trough.png
index 382a0dae..cc66dc02 100644
--- a/themes/Adwaita/gtk-2.0/assets/scale-horz-trough.png
+++ b/themes/Adwaita/gtk-2.0/assets/scale-horz-trough.png
diff --git a/themes/Adwaita/gtk-2.0/assets/scale-vert-trough-active.png b/themes/Adwaita/gtk-2.0/assets/scale-vert-trough-active.png
index 1a932561..0fcd6d38 100644
--- a/themes/Adwaita/gtk-2.0/assets/scale-vert-trough-active.png
+++ b/themes/Adwaita/gtk-2.0/assets/scale-vert-trough-active.png
diff --git a/themes/Adwaita/gtk-2.0/assets/scale-vert-trough.png b/themes/Adwaita/gtk-2.0/assets/scale-vert-trough.png
index 1f1e12d5..f70861d5 100644
--- a/themes/Adwaita/gtk-2.0/assets/scale-vert-trough.png
+++ b/themes/Adwaita/gtk-2.0/assets/scale-vert-trough.png
diff --git a/themes/Adwaita/gtk-2.0/main.rc b/themes/Adwaita/gtk-2.0/main.rc
index f03a7a00..cf02d938 100644
--- a/themes/Adwaita/gtk-2.0/main.rc
+++ b/themes/Adwaita/gtk-2.0/main.rc
@@ -1872,7 +1872,7 @@ style "range" {
     image {
       function = SLIDER
       state    = NORMAL
-      file     = "assets/scale-slider-hover.png"
+      file     = "assets/scale-slider.png"
     }
 
     image {
@@ -1905,7 +1905,7 @@ style "scale_h" {
       function    = BOX
       detail      = "trough-upper"
       file        = "assets/scale-horz-trough.png"
-      border      = {4, 4, 0, 0}
+      border      = {10, 10, 0, 0}
       stretch     = TRUE
     }
 
@@ -1913,7 +1913,7 @@ style "scale_h" {
       function    = BOX
       detail      = "trough-lower"
       file        = "assets/scale-horz-trough-active.png"
-      border      = {4, 4, 0, 0}
+      border      = {10, 10, 0, 0}
       stretch     = TRUE
     }
 
@@ -1929,7 +1929,7 @@ style "scale_v" {
       function    = BOX
       detail      = "trough-upper"
       file        = "assets/scale-vert-trough.png"
-      border      = {0, 0, 4, 4}
+      border      = {0, 0, 10, 10}
       stretch     = TRUE
     }
 
@@ -1937,7 +1937,7 @@ style "scale_v" {
       function    = BOX
       detail      = "trough-lower"
       file        = "assets/scale-vert-trough-active.png"
-      border      = {0, 0, 4, 4}
+      border      = {0, 0, 10, 10}
       stretch     = TRUE
     }