diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 542728dc41..80820b11b9 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -1211,12 +1211,18 @@ GtkCheckButton.text-button:selected { background-color: transparent; }
/************
* GtkScale *
************/
-.scale {
+.scale,
+.scale.scale-has-marks-above.scale-has-marks-below,
+.scale.vertical.scale-has-marks-above.scale-has-marks-below {
-GtkScale-slider-length: 20;
-GtkRange-slider-width: 20;
-GtkRange-trough-border: 2;
outline-offset: -9px;
margin: 10px;
+ &.fine-tune {
+ margin: 8px;
+ &.trough { border-radius: 4px; }
+ }
&.slider {
//FIXME: better gradient on the slider and hover state
@include button(normal, $noedge: true);
@@ -1229,6 +1235,7 @@ GtkCheckButton.text-button:selected { background-color: transparent; }
&:hover {
@include button(hover, $noedge: true);
border-color: darken($borders_color,3%);
+ border-radius: 50%; // needed for double marks scales
box-shadow: inset 0 1px if($variant=='light', white,
transparentize(white,0.85)),
inset 0 #{-2px} if($variant=='light', white,
@@ -1236,10 +1243,14 @@ GtkCheckButton.text-button:selected { background-color: transparent; }
inset 0 #{-1px} mix($bg_color,$borders_color,70%);
}
&:insensitive {
+ border-style: solid; // needed for double marks scales or they'll get
+ border-radius: 50%; // overridden
background-image: linear-gradient(to bottom, $insensitive_bg_color);
box-shadow: none;
}
&:backdrop {
+ border-style: solid; // needed for double marks scales or they'll get
+ border-radius: 50%; // overridden
border-color: darken($backdrop_borders_color,3%);
background-image: linear-gradient(to bottom, $backdrop_bg_color);
box-shadow: none;
@@ -1253,12 +1264,6 @@ GtkCheckButton.text-button:selected { background-color: transparent; }
border: 1px solid if($variant=='light',darken($selected_borders_color,3%),
darken($selected_bg_color,15%));
}
- &.fine-tune:active { //FIXME: Lapo doesn't like the shrinkage. Bad for touch
- border: 4px solid transparent; //margin
- //FIXME: there's a square background under the slider
- box-shadow: inset 0 2px $borders_edge,
- inset 0 0 0 1px darken($selected_borders_color,3%); //border
- }
}
&.trough {
border-width: 1px;
@@ -1294,7 +1299,57 @@ GtkCheckButton.text-button:selected { background-color: transparent; }
}
}
}
+
+$asset_suffix: if($variant=='dark', '-dark', '');
+@each $d,$dn in ('', 'horz'),
+ ('.vertical', 'vert') {
+ @each $w,$we in ('scale-has-marks-below','scale_marks_below'),
+ ('scale-has-marks-above','scale_marks_above') {
+ .scale#{$d}.#{$w} {
+ -GtkScale-slider-length: 20;
+ -GtkRange-slider-width: 24;
+ -GtkRange-trough-border: 2;
+
+ @extend %#{$we}_#{$dn};
+ @each $s,$as in ('',''),
+ (':hover','-hover'),
+ (':active','-active'),
+ (':insensitive','-insensitive'),
+ (':backdrop','-backdrop'),
+ (':backdrop:insensitive','-backdrop-insensitive') {
+ &.slider#{$s} {
+ $_url: 'assets/slider-#{$dn}-#{$w}#{$as}#{$asset_suffix}';
+ border-style: none;
+ border-radius: 0;
+ background-color: transparent;
+ background-image: -gtk-scaled(url('#{$_url}.png'),
+ url('#{$_url}@2.png'));
+ background-repeat: no-repeat;
+ background-position: center;
+ box-shadow: none;
+ }
+ }
+ }
+ }
+}
+
+%scale_marks_above_horz {
+ margin: 14px 10px 10px;
+ &.fine-tune { margin: 12px 8px 8px; }
+}
+%scale_marks_below_horz {
+ margin: 10px 10px 14px;
+ &.fine-tune { margin: 8px 8px 12px; }
+}
+%scale_marks_above_vert {
+ margin: 10px 10px 10px 14px;
+ &.fine-tune { margin: 8px 8px 8px 12px; }
+}
+%scale_marks_below_vert {
+ margin: 10px 14px 10px 10px;
+ &.fine-tune { margin: 8px 12px 8px 8px; }
+}
/*****************
* Progress bars *
diff --git a/gtk/resources/theme/Adwaita/assets.svg b/gtk/resources/theme/Adwaita/assets.svg
index dcdb581391..ed8865abe1 100644
--- a/gtk/resources/theme/Adwaita/assets.svg
+++ b/gtk/resources/theme/Adwaita/assets.svg
@@ -33,156 +33,6 @@
offset="1"
style="stop-color:#d3d3d3;stop-opacity:1;" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -199,16 +49,6 @@
offset="1"
id="stop9530-3-4-7-2-8" />
-
@@ -225,16 +65,6 @@
offset="1"
id="stop9859-2-3-05-6" />
-
-
-
@@ -286,16 +96,6 @@
offset="1"
id="stop9530-3-4-7-5-0-9" />
-
@@ -312,16 +112,6 @@
offset="1"
id="stop9859-2-3-05-6-43-9" />
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ inkscape:collect="always"
+ xlink:href="#linearGradient5581-5-2-4-6-8-7-35-8-0-2"
+ id="linearGradient7101"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(3.0317573,0,0,1.0053174,-102.66338,-0.82153381)"
+ x1="63.568954"
+ y1="127.16142"
+ x2="63.568954"
+ y2="152.6618" />
+
+
+
+
+
+
+
+
+
+
+
+
+ id="stop9526-2-6-8-7-1-0" />
+
+ id="stop9530-3-4-7-2-8-7" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ inkscape:snap-global="false">
@@ -547,7 +969,7 @@
style="display:inline"
sodipodi:insensitive="true">
+ style="color:#000000;fill:#f3f3f3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ d="M 50.9375,-7.59375 44,-0.75 42.125,-2.625 40,-2.65625 l 0,1.71875 2.9375,2.90625 c 0.584627,0.5855605 1.540374,0.5855605 2.125,0 l 5.9375,-6 0,-3.5625 -0.0625,0 z"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.7;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+ inkscape:connector-curvature="0" />