[gnome-themes-standard] hidpi: working scale sliders
- From: Jakub Steiner <jimmac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-themes-standard] hidpi: working scale sliders
- Date: Fri, 2 Aug 2013 23:41:06 +0000 (UTC)
commit 664fecafcb7250ba91a6cb4f419fc4e8bd1cd3f5
Author: Jakub Steiner <jimmac gmail com>
Date: Sat Aug 3 01:38:53 2013 +0200
hidpi: working scale sliders
- actually render the missing bits
- reference them in css
- add to gresource
themes/Adwaita/gtk-3.0/assets.svg | 52 +++++++++++++++++---
.../menuitem-checkbox-checked-selected 2 png | Bin 0 -> 446 bytes
.../assets/menuitem-checkbox-mixed-selected 2 png | Bin 0 -> 215 bytes
.../assets/menuitem-radio-checked-selected 2 png | Bin 0 -> 299 bytes
.../assets/scale-slider-horz-active-dark 2 png | Bin 0 -> 1121 bytes
.../gtk-3.0/assets/scale-slider-horz-active 2 png | Bin 0 -> 1201 bytes
.../assets/scale-slider-horz-backdrop-dark 2 png | Bin 0 -> 882 bytes
ale-slider-horz-backdrop-insensitive-dark 2 png | Bin 0 -> 1072 bytes
.../scale-slider-horz-backdrop-insensitive 2 png | Bin 0 -> 1129 bytes
.../assets/scale-slider-horz-backdrop 2 png | Bin 0 -> 1172 bytes
.../gtk-3.0/assets/scale-slider-horz-dark 2 png | Bin 0 -> 1377 bytes
.../assets/scale-slider-horz-hover-dark 2 png | Bin 0 -> 1411 bytes
.../gtk-3.0/assets/scale-slider-horz-hover 2 png | Bin 0 -> 1365 bytes
.../scale-slider-horz-insensitive-dark 2 png | Bin 0 -> 882 bytes
.../assets/scale-slider-horz-insensitive 2 png | Bin 0 -> 1172 bytes
.../Adwaita/gtk-3.0/assets/scale-slider-horz 2 png | Bin 0 -> 1423 bytes
.../assets/scale-slider-vert-active-dark 2 png | Bin 0 -> 1141 bytes
.../gtk-3.0/assets/scale-slider-vert-active 2 png | Bin 0 -> 1334 bytes
.../assets/scale-slider-vert-backdrop-dark 2 png | Bin 0 -> 882 bytes
ale-slider-vert-backdrop-insensitive-dark 2 png | Bin 0 -> 1044 bytes
.../scale-slider-vert-backdrop-insensitive 2 png | Bin 0 -> 980 bytes
.../assets/scale-slider-vert-backdrop 2 png | Bin 0 -> 1172 bytes
.../gtk-3.0/assets/scale-slider-vert-dark 2 png | Bin 0 -> 1382 bytes
.../assets/scale-slider-vert-hover-dark 2 png | Bin 0 -> 1418 bytes
.../gtk-3.0/assets/scale-slider-vert-hover 2 png | Bin 0 -> 1407 bytes
.../scale-slider-vert-insensitive-dark 2 png | Bin 0 -> 901 bytes
.../assets/scale-slider-vert-insensitive 2 png | Bin 0 -> 1030 bytes
.../Adwaita/gtk-3.0/assets/scale-slider-vert 2 png | Bin 0 -> 1437 bytes
themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css | 24 +++++-----
themes/Adwaita/gtk-3.0/gtk-widgets-assets.css | 24 +++++-----
themes/Adwaita/gtk-3.0/gtk.gresource.xml | 27 ++++++++++
themes/Adwaita/gtk-3.0/render-assets.sh | 2 +-
32 files changed, 96 insertions(+), 33 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/assets.svg b/themes/Adwaita/gtk-3.0/assets.svg
index b8cb889..4df462a 100644
--- a/themes/Adwaita/gtk-3.0/assets.svg
+++ b/themes/Adwaita/gtk-3.0/assets.svg
@@ -15,7 +15,7 @@
id="svg9892"
version="1.1"
inkscape:version="0.48.4 r9939"
- sodipodi:docname="assets-new.svg">
+ sodipodi:docname="assets.svg">
<defs
id="defs9894">
<linearGradient
@@ -5281,14 +5281,14 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1"
- inkscape:cx="323.93395"
+ inkscape:cx="405.93395"
inkscape:cy="866.61188"
inkscape:document-units="px"
inkscape:current-layer="layer4"
showgrid="false"
showborder="false"
inkscape:window-width="2560"
- inkscape:window-height="1381"
+ inkscape:window-height="1629"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-maximized="1"
@@ -8589,7 +8589,7 @@
id="g20003">
<rect
ry="15.542924"
-
style="color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:#858783;stroke-width:2.08838307;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;clip-rule:nonzero"
+
style="color:#000000;fill:none;stroke:#858783;stroke-width:2.08838296;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect20005"
width="29.5"
height="29"
@@ -8604,7 +8604,7 @@
id="g20007"
style="display:inline">
<rect
-
style="color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#858783;fill-opacity:1;fill-rule:nonzero;stroke:#858783;stroke-width:1.07163241;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;clip-rule:nonzero"
+
style="color:#000000;fill:#858783;fill-opacity:1;fill-rule:nonzero;stroke:#858783;stroke-width:1.07163239;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect20009"
width="8.4957857"
height="2.3367147"
@@ -9334,7 +9334,7 @@
style="color:#000000;fill:#f8f8f6;fill-opacity:1;fill-rule:nonzero;stroke:#a7a7a7;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="path5079-0-7"
inkscape:href="#path5960"
- d="m 359.40625,8.5 -6.90625,8.9375 0,7.84375 c 0,1.237216 0.96379,2.21875 2.15625,2.21875 l
10.6875,0 c 1.19247,0 2.15625,-0.981535 2.15625,-2.21875 l 0,-7.84375 L 360.4375,8.53125 359.40625,8.5 Z"
+ d="m 359.40625,8.5 -6.90625,8.9375 0,7.84375 c 0,1.237216 0.96379,2.21875 2.15625,2.21875 l
10.6875,0 c 1.19247,0 2.15625,-0.981535 2.15625,-2.21875 l 0,-7.84375 L 360.4375,8.53125 359.40625,8.5 z"
transform="matrix(0,1,-1,0,438,-322)" />
<rect
transform="matrix(0,1,-1,0,0,0)"
@@ -11967,7 +11967,7 @@
sodipodi:cy="290.25"
sodipodi:rx="6.875"
sodipodi:ry="6.875"
- d="m 319.25,290.25 a 6.875,6.875 0 1 1 -13.75,0 6.875,6.875 0 1 1 13.75,0 z"
+ d="m 319.25,290.25 c 0,3.79696 -3.07804,6.875 -6.875,6.875 -3.79696,0 -6.875,-3.07804 -6.875,-6.875
0,-3.79696 3.07804,-6.875 6.875,-6.875 3.79696,0 6.875,3.07804 6.875,6.875 z"
transform="matrix(1.0909091,0,0,1.0909091,-80.77273,-206.27418)" />
<use
style="display:inline"
@@ -12101,7 +12101,7 @@
transform="translate(-16.000005,172.36219)">
<path
transform="matrix(1.0909091,0,0,1.0909091,-50.772725,-298.63638)"
- d="m 319.25,290.25 a 6.875,6.875 0 1 1 -13.75,0 6.875,6.875 0 1 1 13.75,0 z"
+ d="m 319.25,290.25 c 0,3.79696 -3.07804,6.875 -6.875,6.875 -3.79696,0 -6.875,-3.07804 -6.875,-6.875
0,-3.79696 3.07804,-6.875 6.875,-6.875 3.79696,0 6.875,3.07804 6.875,6.875 z"
sodipodi:ry="6.875"
sodipodi:rx="6.875"
sodipodi:cy="290.25"
@@ -12426,5 +12426,41 @@
ry="0"
transform="matrix(0,1,-1,0,0,0)" />
</g>
+ <use
+ x="0"
+ y="0"
+ xlink:href="#scale-slider-horz-insensitive"
+ id="scale-slider-horz-backdrop"
+ transform="translate(44,0)"
+ width="1000"
+ height="1052.3622"
+ inkscape:label="#use6893" />
+ <use
+ x="0"
+ y="0"
+ xlink:href="#scale-slider-horz-backdrop"
+ id="scale-slider-vert-backdrop"
+ transform="translate(0,20)"
+ width="1000"
+ height="1052.3622"
+ inkscape:label="#use6895" />
+ <use
+ x="0"
+ y="0"
+ xlink:href="#scale-slider-horz-insensitive-dark"
+ id="scale-slider-horz-backdrop-dark"
+ transform="translate(44,0)"
+ width="1000"
+ height="1052.3622"
+ inkscape:label="#use6897" />
+ <use
+ x="0"
+ y="0"
+ xlink:href="#scale-slider-horz-backdrop-dark"
+ id="scale-slider-vert-backdrop-dark"
+ transform="translate(0,20)"
+ width="1000"
+ height="1052.3622"
+ inkscape:label="#use6899" />
</g>
</svg>
diff --git a/themes/Adwaita/gtk-3.0/assets/menuitem-checkbox-checked-selected 2 png
b/themes/Adwaita/gtk-3.0/assets/menuitem-checkbox-checked-selected 2 png
new file mode 100644
index 0000000..e192d41
Binary files /dev/null and b/themes/Adwaita/gtk-3.0/assets/menuitem-checkbox-checked-selected 2 png differ
diff --git a/themes/Adwaita/gtk-3.0/assets/menuitem-checkbox-mixed-selected 2 png
b/themes/Adwaita/gtk-3.0/assets/menuitem-checkbox-mixed-selected 2 png
new file mode 100644
index 0000000..53f730b
Binary files /dev/null and b/themes/Adwaita/gtk-3.0/assets/menuitem-checkbox-mixed-selected 2 png differ
diff --git a/themes/Adwaita/gtk-3.0/assets/menuitem-radio-checked-selected 2 png
b/themes/Adwaita/gtk-3.0/assets/menuitem-radio-checked-selected 2 png
new file mode 100644
index 0000000..de765ae
Binary files /dev/null and b/themes/Adwaita/gtk-3.0/assets/menuitem-radio-checked-selected 2 png differ
diff --git a/themes/Adwaita/gtk-3.0/assets/scale-slider-horz-active-dark 2 png
b/themes/Adwaita/gtk-3.0/assets/scale-slider-horz-active-dark 2 png
new file mode 100644
index 0000000..1764ba1
Binary files /dev/null and b/themes/Adwaita/gtk-3.0/assets/scale-slider-horz-active-dark 2 png differ
diff --git a/themes/Adwaita/gtk-3.0/assets/scale-slider-horz-active 2 png
b/themes/Adwaita/gtk-3.0/assets/scale-slider-horz-active 2 png
new file mode 100644
index 0000000..1eb6019
Binary files /dev/null and b/themes/Adwaita/gtk-3.0/assets/scale-slider-horz-active 2 png differ
diff --git a/themes/Adwaita/gtk-3.0/assets/scale-slider-horz-backdrop-dark 2 png
b/themes/Adwaita/gtk-3.0/assets/scale-slider-horz-backdrop-dark 2 png
new file mode 100644
index 0000000..0403529
Binary files /dev/null and b/themes/Adwaita/gtk-3.0/assets/scale-slider-horz-backdrop-dark 2 png differ
diff --git a/themes/Adwaita/gtk-3.0/assets/scale-slider-horz-backdrop-insensitive-dark 2 png
b/themes/Adwaita/gtk-3.0/assets/scale-slider-horz-backdrop-insensitive-dark 2 png
new file mode 100644
index 0000000..27549bd
Binary files /dev/null and b/themes/Adwaita/gtk-3.0/assets/scale-slider-horz-backdrop-insensitive-dark 2 png
differ
diff --git a/themes/Adwaita/gtk-3.0/assets/scale-slider-horz-backdrop-insensitive 2 png
b/themes/Adwaita/gtk-3.0/assets/scale-slider-horz-backdrop-insensitive 2 png
new file mode 100644
index 0000000..68cbdab
Binary files /dev/null and b/themes/Adwaita/gtk-3.0/assets/scale-slider-horz-backdrop-insensitive 2 png differ
diff --git a/themes/Adwaita/gtk-3.0/assets/scale-slider-horz-backdrop 2 png
b/themes/Adwaita/gtk-3.0/assets/scale-slider-horz-backdrop 2 png
new file mode 100644
index 0000000..77838fa
Binary files /dev/null and b/themes/Adwaita/gtk-3.0/assets/scale-slider-horz-backdrop 2 png differ
diff --git a/themes/Adwaita/gtk-3.0/assets/scale-slider-horz-dark 2 png
b/themes/Adwaita/gtk-3.0/assets/scale-slider-horz-dark 2 png
new file mode 100644
index 0000000..3984895
Binary files /dev/null and b/themes/Adwaita/gtk-3.0/assets/scale-slider-horz-dark 2 png differ
diff --git a/themes/Adwaita/gtk-3.0/assets/scale-slider-horz-hover-dark 2 png
b/themes/Adwaita/gtk-3.0/assets/scale-slider-horz-hover-dark 2 png
new file mode 100644
index 0000000..1c54af2
Binary files /dev/null and b/themes/Adwaita/gtk-3.0/assets/scale-slider-horz-hover-dark 2 png differ
diff --git a/themes/Adwaita/gtk-3.0/assets/scale-slider-horz-hover 2 png
b/themes/Adwaita/gtk-3.0/assets/scale-slider-horz-hover 2 png
new file mode 100644
index 0000000..d54b9b0
Binary files /dev/null and b/themes/Adwaita/gtk-3.0/assets/scale-slider-horz-hover 2 png differ
diff --git a/themes/Adwaita/gtk-3.0/assets/scale-slider-horz-insensitive-dark 2 png
b/themes/Adwaita/gtk-3.0/assets/scale-slider-horz-insensitive-dark 2 png
new file mode 100644
index 0000000..0403529
Binary files /dev/null and b/themes/Adwaita/gtk-3.0/assets/scale-slider-horz-insensitive-dark 2 png differ
diff --git a/themes/Adwaita/gtk-3.0/assets/scale-slider-horz-insensitive 2 png
b/themes/Adwaita/gtk-3.0/assets/scale-slider-horz-insensitive 2 png
new file mode 100644
index 0000000..77838fa
Binary files /dev/null and b/themes/Adwaita/gtk-3.0/assets/scale-slider-horz-insensitive 2 png differ
diff --git a/themes/Adwaita/gtk-3.0/assets/scale-slider-horz 2 png
b/themes/Adwaita/gtk-3.0/assets/scale-slider-horz 2 png
new file mode 100644
index 0000000..a54021c
Binary files /dev/null and b/themes/Adwaita/gtk-3.0/assets/scale-slider-horz 2 png differ
diff --git a/themes/Adwaita/gtk-3.0/assets/scale-slider-vert-active-dark 2 png
b/themes/Adwaita/gtk-3.0/assets/scale-slider-vert-active-dark 2 png
new file mode 100644
index 0000000..3539c28
Binary files /dev/null and b/themes/Adwaita/gtk-3.0/assets/scale-slider-vert-active-dark 2 png differ
diff --git a/themes/Adwaita/gtk-3.0/assets/scale-slider-vert-active 2 png
b/themes/Adwaita/gtk-3.0/assets/scale-slider-vert-active 2 png
new file mode 100644
index 0000000..b7f8676
Binary files /dev/null and b/themes/Adwaita/gtk-3.0/assets/scale-slider-vert-active 2 png differ
diff --git a/themes/Adwaita/gtk-3.0/assets/scale-slider-vert-backdrop-dark 2 png
b/themes/Adwaita/gtk-3.0/assets/scale-slider-vert-backdrop-dark 2 png
new file mode 100644
index 0000000..0403529
Binary files /dev/null and b/themes/Adwaita/gtk-3.0/assets/scale-slider-vert-backdrop-dark 2 png differ
diff --git a/themes/Adwaita/gtk-3.0/assets/scale-slider-vert-backdrop-insensitive-dark 2 png
b/themes/Adwaita/gtk-3.0/assets/scale-slider-vert-backdrop-insensitive-dark 2 png
new file mode 100644
index 0000000..47c8f29
Binary files /dev/null and b/themes/Adwaita/gtk-3.0/assets/scale-slider-vert-backdrop-insensitive-dark 2 png
differ
diff --git a/themes/Adwaita/gtk-3.0/assets/scale-slider-vert-backdrop-insensitive 2 png
b/themes/Adwaita/gtk-3.0/assets/scale-slider-vert-backdrop-insensitive 2 png
new file mode 100644
index 0000000..0e96b23
Binary files /dev/null and b/themes/Adwaita/gtk-3.0/assets/scale-slider-vert-backdrop-insensitive 2 png differ
diff --git a/themes/Adwaita/gtk-3.0/assets/scale-slider-vert-backdrop 2 png
b/themes/Adwaita/gtk-3.0/assets/scale-slider-vert-backdrop 2 png
new file mode 100644
index 0000000..77838fa
Binary files /dev/null and b/themes/Adwaita/gtk-3.0/assets/scale-slider-vert-backdrop 2 png differ
diff --git a/themes/Adwaita/gtk-3.0/assets/scale-slider-vert-dark 2 png
b/themes/Adwaita/gtk-3.0/assets/scale-slider-vert-dark 2 png
new file mode 100644
index 0000000..b0a1387
Binary files /dev/null and b/themes/Adwaita/gtk-3.0/assets/scale-slider-vert-dark 2 png differ
diff --git a/themes/Adwaita/gtk-3.0/assets/scale-slider-vert-hover-dark 2 png
b/themes/Adwaita/gtk-3.0/assets/scale-slider-vert-hover-dark 2 png
new file mode 100644
index 0000000..040d18c
Binary files /dev/null and b/themes/Adwaita/gtk-3.0/assets/scale-slider-vert-hover-dark 2 png differ
diff --git a/themes/Adwaita/gtk-3.0/assets/scale-slider-vert-hover 2 png
b/themes/Adwaita/gtk-3.0/assets/scale-slider-vert-hover 2 png
new file mode 100644
index 0000000..1517e0a
Binary files /dev/null and b/themes/Adwaita/gtk-3.0/assets/scale-slider-vert-hover 2 png differ
diff --git a/themes/Adwaita/gtk-3.0/assets/scale-slider-vert-insensitive-dark 2 png
b/themes/Adwaita/gtk-3.0/assets/scale-slider-vert-insensitive-dark 2 png
new file mode 100644
index 0000000..f5c9606
Binary files /dev/null and b/themes/Adwaita/gtk-3.0/assets/scale-slider-vert-insensitive-dark 2 png differ
diff --git a/themes/Adwaita/gtk-3.0/assets/scale-slider-vert-insensitive 2 png
b/themes/Adwaita/gtk-3.0/assets/scale-slider-vert-insensitive 2 png
new file mode 100644
index 0000000..d153509
Binary files /dev/null and b/themes/Adwaita/gtk-3.0/assets/scale-slider-vert-insensitive 2 png differ
diff --git a/themes/Adwaita/gtk-3.0/assets/scale-slider-vert 2 png
b/themes/Adwaita/gtk-3.0/assets/scale-slider-vert 2 png
new file mode 100644
index 0000000..8b7826f
Binary files /dev/null and b/themes/Adwaita/gtk-3.0/assets/scale-slider-vert 2 png differ
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css
b/themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css
index 6b17243..548a848 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css
@@ -200,69 +200,69 @@
*********************/
.scale.slider,
.scale.slider.horizontal {
- background-image: url("assets/scale-slider-horz-dark.png");
+ background-image: -gtk-scaled(url("assets/scale-slider-horz-dark.png"),
url("assets/scale-slider-horz-dark 2 png"));
}
.scale.slider:hover,
.scale.slider.horizontal:hover {
- background-image: url("assets/scale-slider-horz-hover-dark.png");
+ background-image: -gtk-scaled(url("assets/scale-slider-horz-hover-dark.png"),
url("assets/scale-slider-horz-hover-dark 2 png"));
}
.scale.slider:active,
.scale.slider:active:hover,
.scale.slider.horizontal:active,
.scale.slider.horizontal:active:hover {
- background-image: url("assets/scale-slider-horz-active-dark.png");
+ background-image: -gtk-scaled(url("assets/scale-slider-horz-active-dark.png"),
url("assets/scale-slider-horz-active-dark 2 png"));
}
.scale.slider:backdrop,
.scale.slider:backdrop:hover,
.scale.slider.horizontal:backdrop,
.scale.slider.horizontal:backdrop:hover {
- background-image: url("assets/scale-slider-horz-backdrop-dark.png");
+ background-image: -gtk-scaled(url("assets/scale-slider-horz-backdrop-dark.png"),
url("assets/scale-slider-horz-backdrop-dark 2 png"));
}
.scale.slider:insensitive,
.scale.slider:insensitive:hover,
.scale.slider.horizontal:insensitive,
.scale.slider.horizontal:insensitive:hover {
- background-image: url("assets/scale-slider-horz-insensitive-dark.png");
+ background-image: -gtk-scaled(url("assets/scale-slider-horz-insensitive-dark.png"),
url("assets/scale-slider-horz-insensitive-dark 2 png"));
}
.scale.slider:insensitive:backdrop,
.scale.slider:insensitive:backdrop:hover,
.scale.slider.horizontal:insensitive:backdrop,
.scale.slider.horizontal:insensitive:backdrop:hover {
- background-image: url("assets/scale-slider-horz-backdrop-insensitive-dark.png");
+ background-image: -gtk-scaled(url("assets/scale-slider-horz-backdrop-insensitive-dark.png"),
url("assets/scale-slider-horz-backdrop-insensitive-dark 2 png"));
}
.scale.slider.vertical {
- background-image: url("assets/scale-slider-vert-dark.png");
+ background-image: -gtk-scaled(url("assets/scale-slider-vert-dark.png"),
url("assets/scale-slider-vert-dark 2 png"));
}
.scale.slider.vertical:hover {
- background-image: url("assets/scale-slider-vert-hover-dark.png");
+ background-image: -gtk-scaled(url("assets/scale-slider-vert-hover-dark.png"),
url("assets/scale-slider-vert-hover-dark 2 png"));
}
.scale.slider.vertical:active,
.scale.slider.vertical:active:hover {
- background-image: url("assets/scale-slider-vert-active-dark.png");
+ background-image: -gtk-scaled(url("assets/scale-slider-vert-active-dark.png"),
url("assets/scale-slider-vert-active-dark 2 png"));
}
.scale.slider.vertical:backdrop,
.scale.slider.vertical:backdrop:hover {
- background-image: url("assets/scale-slider-vert-backdrop-dark.png");
+ background-image: -gtk-scaled(url("assets/scale-slider-vert-backdrop-dark.png"),
url("assets/scale-slider-vert-backdrop-dark 2 png"));
}
.scale.slider.vertical:insensitive,
.scale.slider.vertical:insensitive:hover {
- background-image: url("assets/scale-slider-vert-insensitive-dark.png");
+ background-image: -gtk-scaled(url("assets/scale-slider-vert-insensitive-dark.png"),
url("assets/scale-slider-vert-insensitive-dark 2 png"));
}
.scale.slider.vertical:insensitive:backdrop,
.scale.slider.vertical:insensitive:backdrop:hover {
- background-image: url("assets/scale-slider-vert-backdrop-insensitive-dark.png");
+ background-image: -gtk-scaled(url("assets/scale-slider-vert-backdrop-insensitive-dark.png"),
url("assets/scale-slider-vert-backdrop-insensitive-dark 2 png"));
}
.scale.scale-has-marks-above.slider.horizontal {
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-assets.css b/themes/Adwaita/gtk-3.0/gtk-widgets-assets.css
index a50479c..7029945 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-assets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-assets.css
@@ -191,69 +191,69 @@
*********************/
.scale.slider,
.scale.slider.horizontal {
- background-image: url("assets/scale-slider-horz.png");
+ background-image: -gtk-scaled(url("assets/scale-slider-horz.png"), url("assets/scale-slider-horz 2
png"));
}
.scale.slider:hover,
.scale.slider.horizontal:hover {
- background-image: url("assets/scale-slider-horz-hover.png");
+ background-image:
-gtk-scaled(url("assets/scale-slider-horz-hover.png"),url("assets/scale-slider-horz-hover 2 png"));
}
.scale.slider:active,
.scale.slider:active:hover,
.scale.slider.horizontal:active,
.scale.slider.horizontal:active:hover {
- background-image: url("assets/scale-slider-horz-active.png");
+ background-image:
-gtk-scaled(url("assets/scale-slider-horz-active.png"),url("assets/scale-slider-horz-active 2 png"));
}
.scale.slider:backdrop,
.scale.slider:backdrop:hover,
.scale.slider.horizontal:backdrop,
.scale.slider.horizontal:backdrop:hover {
- background-image: url("assets/scale-slider-horz-backdrop.png");
+ background-image:
-gtk-scaled(url("assets/scale-slider-horz-backdrop.png"),url("assets/scale-slider-horz-backdrop 2 png"));
}
.scale.slider:insensitive,
.scale.slider:insensitive:hover,
.scale.slider.horizontal:insensitive,
.scale.slider.horizontal:insensitive:hover {
- background-image: url("assets/scale-slider-horz-insensitive.png");
+ background-image:
-gtk-scaled(url("assets/scale-slider-horz-insensitive.png"),url("assets/scale-slider-horz-insensitive 2
png"));
}
.scale.slider:insensitive:backdrop,
.scale.slider:insensitive:backdrop:hover,
.scale.slider.horizontal:insensitive:backdrop,
.scale.slider.horizontal:insensitive:backdrop:hover {
- background-image: url("assets/scale-slider-horz-backdrop-insensitive.png");
+ background-image:
-gtk-scaled(url("assets/scale-slider-horz-backdrop-insensitive.png"),url("assets/scale-slider-horz-backdrop-insensitive
2 png"));
}
.scale.slider.vertical {
- background-image: url("assets/scale-slider-vert.png");
+ background-image: -gtk-scaled(url("assets/scale-slider-vert.png"),url("assets/scale-slider-vert 2 png"));
}
.scale.slider.vertical:hover {
- background-image: url("assets/scale-slider-vert-hover.png");
+ background-image:
-gtk-scaled(url("assets/scale-slider-vert-hover.png"),url("assets/scale-slider-vert-hover.png"));
}
.scale.slider.vertical:active,
.scale.slider.vertical:active:hover {
- background-image: url("assets/scale-slider-vert-active.png");
+ background-image:
-gtk-scaled(url("assets/scale-slider-vert-active.png"),url("assets/scale-slider-vert-active 2 png"));
}
.scale.slider.vertical:backdrop,
.scale.slider.vertical:backdrop:hover {
- background-image: url("assets/scale-slider-vert-backdrop.png");
+ background-image:
-gtk-scaled(url("assets/scale-slider-vert-backdrop.png"),url("assets/scale-slider-vert-backdrop 2 png"));
}
.scale.slider.vertical:insensitive,
.scale.slider.vertical:insensitive:hover {
- background-image: url("assets/scale-slider-vert-insensitive.png");
+ background-image:
-gtk-scaled(url("assets/scale-slider-vert-insensitive.png"),url("assets/scale-slider-vert-insensitive 2
png"));
}
.scale.slider.vertical:insensitive:backdrop,
.scale.slider.vertical:insensitive:backdrop:hover {
- background-image: url("assets/scale-slider-vert-backdrop-insensitive.png");
+ background-image:
-gtk-scaled(url("assets/scale-slider-vert-backdrop-insensitive.png"),url("assets/scale-slider-vert-backdrop-insensitive
2 png"));
}
.scale.scale-has-marks-above.slider.horizontal {
diff --git a/themes/Adwaita/gtk-3.0/gtk.gresource.xml b/themes/Adwaita/gtk-3.0/gtk.gresource.xml
index 8fe8752..781a674 100644
--- a/themes/Adwaita/gtk-3.0/gtk.gresource.xml
+++ b/themes/Adwaita/gtk-3.0/gtk.gresource.xml
@@ -55,16 +55,19 @@
<file preprocess="to-pixdata">assets/menuitem-checkbox-checked-insensitive.png</file>
<file preprocess="to-pixdata">assets/menuitem-checkbox-checked-insensitive 2 png</file>
<file preprocess="to-pixdata">assets/menuitem-checkbox-checked-selected.png</file>
+ <file preprocess="to-pixdata">assets/menuitem-checkbox-checked-selected 2 png</file>
<file preprocess="to-pixdata">assets/menuitem-checkbox-checked.png</file>
<file preprocess="to-pixdata">assets/menuitem-checkbox-checked 2 png</file>
<file preprocess="to-pixdata">assets/menuitem-checkbox-mixed-insensitive.png</file>
<file preprocess="to-pixdata">assets/menuitem-checkbox-mixed-insensitive 2 png</file>
<file preprocess="to-pixdata">assets/menuitem-checkbox-mixed-selected.png</file>
+ <file preprocess="to-pixdata">assets/menuitem-checkbox-mixed-selected 2 png</file>
<file preprocess="to-pixdata">assets/menuitem-checkbox-mixed.png</file>
<file preprocess="to-pixdata">assets/menuitem-checkbox-mixed 2 png</file>
<file preprocess="to-pixdata">assets/menuitem-radio-checked-insensitive.png</file>
<file preprocess="to-pixdata">assets/menuitem-radio-checked-insensitive 2 png</file>
<file preprocess="to-pixdata">assets/menuitem-radio-checked-selected.png</file>
+ <file preprocess="to-pixdata">assets/menuitem-radio-checked-selected 2 png</file>
<file preprocess="to-pixdata">assets/menuitem-radio-checked.png</file>
<file preprocess="to-pixdata">assets/menuitem-radio-checked 2 png</file>
<file preprocess="to-pixdata">assets/noise-texture-dark.png</file>
@@ -151,17 +154,29 @@
<file preprocess="to-pixdata">assets/scale-slider-down.png</file>
<file preprocess="to-pixdata">assets/scale-slider-down 2 png</file>
<file preprocess="to-pixdata">assets/scale-slider-horz-active-dark.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-horz-active-dark 2 png</file>
<file preprocess="to-pixdata">assets/scale-slider-horz-active.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-horz-active 2 png</file>
<file preprocess="to-pixdata">assets/scale-slider-horz-backdrop-dark.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-horz-backdrop-dark 2 png</file>
<file preprocess="to-pixdata">assets/scale-slider-horz-backdrop-insensitive-dark.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-horz-backdrop-insensitive-dark 2 png</file>
<file preprocess="to-pixdata">assets/scale-slider-horz-backdrop-insensitive.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-horz-backdrop-insensitive 2 png</file>
<file preprocess="to-pixdata">assets/scale-slider-horz-backdrop.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-horz-backdrop 2 png</file>
<file preprocess="to-pixdata">assets/scale-slider-horz-dark.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-horz-dark 2 png</file>
<file preprocess="to-pixdata">assets/scale-slider-horz-hover-dark.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-horz-hover-dark 2 png</file>
<file preprocess="to-pixdata">assets/scale-slider-horz-hover.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-horz-hover 2 png</file>
<file preprocess="to-pixdata">assets/scale-slider-horz-insensitive-dark.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-horz-insensitive-dark 2 png</file>
<file preprocess="to-pixdata">assets/scale-slider-horz-insensitive.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-horz-insensitive 2 png</file>
<file preprocess="to-pixdata">assets/scale-slider-horz.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-horz 2 png</file>
<file preprocess="to-pixdata">assets/scale-slider-left-active-dark.png</file>
<file preprocess="to-pixdata">assets/scale-slider-left-active-dark 2 png</file>
<file preprocess="to-pixdata">assets/scale-slider-left-active.png</file>
@@ -235,17 +250,29 @@
<file preprocess="to-pixdata">assets/scale-slider-up.png</file>
<file preprocess="to-pixdata">assets/scale-slider-up 2 png</file>
<file preprocess="to-pixdata">assets/scale-slider-vert-active-dark.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-vert-active-dark 2 png</file>
<file preprocess="to-pixdata">assets/scale-slider-vert-active.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-vert-active 2 png</file>
<file preprocess="to-pixdata">assets/scale-slider-vert-backdrop-dark.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-vert-backdrop-dark 2 png</file>
<file preprocess="to-pixdata">assets/scale-slider-vert-backdrop-insensitive-dark.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-vert-backdrop-insensitive-dark 2 png</file>
<file preprocess="to-pixdata">assets/scale-slider-vert-backdrop-insensitive.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-vert-backdrop-insensitive 2 png</file>
<file preprocess="to-pixdata">assets/scale-slider-vert-backdrop.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-vert-backdrop 2 png</file>
<file preprocess="to-pixdata">assets/scale-slider-vert-dark.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-vert-dark 2 png</file>
<file preprocess="to-pixdata">assets/scale-slider-vert-hover-dark.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-vert-hover-dark 2 png</file>
<file preprocess="to-pixdata">assets/scale-slider-vert-hover.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-vert-hover 2 png</file>
<file preprocess="to-pixdata">assets/scale-slider-vert-insensitive-dark.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-vert-insensitive-dark 2 png</file>
<file preprocess="to-pixdata">assets/scale-slider-vert-insensitive.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-vert-insensitive 2 png</file>
<file preprocess="to-pixdata">assets/scale-slider-vert.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-vert 2 png</file>
<file preprocess="to-pixdata">assets/sidebar-radio-checked-dark.svg</file>
<file preprocess="to-pixdata">assets/sidebar-radio-checked.svg</file>
<file preprocess="to-pixdata">assets/sidebar-radio-prelight.svg</file>
diff --git a/themes/Adwaita/gtk-3.0/render-assets.sh b/themes/Adwaita/gtk-3.0/render-assets.sh
index ddae1a9..24d7675 100755
--- a/themes/Adwaita/gtk-3.0/render-assets.sh
+++ b/themes/Adwaita/gtk-3.0/render-assets.sh
@@ -3,7 +3,7 @@
INKSCAPE="/usr/bin/inkscape"
OPTIPNG="/usr/bin/optipng"
-SRC_FILE="assets-new.svg"
+SRC_FILE="assets.svg"
ASSETS_DIR="assets"
INDEX="assets.txt"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]