Bump version to 3.32.1

Update NEWS.

NEWS

@@ -1,3 +1,34 @@
+3.32.1
+======
+* Fix avatar scaling on login screen [Florian; #1024]
+* Fix distortion of desktop zoom [Florian; #646]
+* Fix mouse cursor visibility when using desktop zoom [Florian, Marco; #1020]
+* Fix screen dimming after wake-up on lock screen [Xiaoguang; #900]
+* Fix Alt+Esc switcher [Florian; #1064]
+* Respect struts for popover placement [Andrea; #1102]
+* Fix app icons updates after theme changes [Florian; #1117]
+* Fix desktop zoom after resolution changes [Marco; #1120]
+* Implement stick-to-finger workspace switch overview gestures [Florian; #516]
+* Make World Clocks offsets relative to local time [Florian; #1157]
+* Fix top app icon disappearing from dash [Florian; #1053]
+* Update switch style to match new Adwaita [Jakub; !496]
+* Ensure CSS units are pixel-aligned when scaling is used [Carlos; #91]
+* Misc. bug fixes and cleanups [Florian, Jakub, Robert, Alex, Carlos, Phil,
+  Marco, Benjamin, AsciiWolf, Ray, verdre; !444, #1016, #1018, !449, #1036,
+  !455, #1094, !440, #1023, #624, #1017, !476, !473, !480, #1130, !485, !481,
+  !490, !489, #1151, !435, #1160, !482, #1150, #1166, !384]
+
+Contributors:
+  AsciiWolf, Andrea Azzarone, Benjamin Berg, Carlos Garnacho, Victor Ibragimov,
+  Robert Mader, Alex Monday, Florian Müllner, Jakub Steiner, Ray Strode,
+  Marco Trevisan (Treviño), verdre, Xiaoguang Wang, Phil Wyett
+
+Translators:
+  Victor Ibragimov [tg, af, et, ja], Bruce Cowan [en_GB], Piotr Drąg [tg],
+  Charles Monzat [fr], Khaled Hosny [ar], Goran Vidović [hr],
+  Cheng-Chia Tseng [zh_TW], Carmen Bianca BAKKER [eo], Daniel Mustieles [es],
+  Dušan Kazik [sk]
+
 3.32.0
 ======
 * Fix sizing issues in on-screen-keyboard emoji panel [Carlos; !439]

data/gnome-shell-theme.gresource.xml

@@ -21,10 +21,8 @@
     <file>noise-texture.png</file>
     <file>pad-osd.css</file>
     <file>process-working.svg</file>
-    <file>toggle-off-us.svg</file>
     <file>toggle-off-intl.svg</file>
     <file>toggle-off-hc.svg</file>
-    <file>toggle-on-us.svg</file>
     <file>toggle-on-intl.svg</file>
     <file>toggle-on-hc.svg</file>
   </gresource>

data/theme/gnome-shell-sass/_common.scss

@@ -157,18 +157,13 @@ StScrollBar {
 
 /* Switches */
 .toggle-switch {
-  width: 65px;
+  width: 46px;
   height: 22px;
   background-size: contain;
+  background-image: url("resource:///org/gnome/shell/theme/toggle-off-intl.svg");
+  &:checked { background-image: url("resource:///org/gnome/shell/theme/toggle-on-intl.svg"); }
 }
 
-  @each $v in us, intl {
-    .toggle-switch-#{$v} {
-      background-image: url("resource:///org/gnome/shell/theme/toggle-off-#{$v}.svg");
-      &:checked { background-image: url("resource:///org/gnome/shell/theme/toggle-on-#{$v}.svg"); }
-    }
-  }
-
 /* links */
 .shell-link {
   color: $link_color;

data/theme/toggle-off-intl.svg

@@ -10,124 +10,62 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="65"
+   width="46"
    height="22"
-   id="svg2857"
+   viewBox="0 0 46 22"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
+   id="svg2751"
-   sodipodi:docname="toggle-off-us.svg">
+   inkscape:version="0.92.4 5da689c313, 2019-01-14"
+   sodipodi:docname="toggle-off-intl.svg">
   <defs
-     id="defs2859">
+     id="defs2745">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2865" />
-    <inkscape:perspective
-       id="perspective2843"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient76469-7-7-4"
+       id="linearGradient3329">
-       id="linearGradient38024"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0215462,0,0,1.0322581,717.22867,428.68472)"
-       x1="6"
-       y1="102.95528"
-       x2="6"
-       y2="84.505203" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient76469-7-7-4">
       <stop
-         style="stop-color:#2e3232;stop-opacity:1"
+         style="stop-color:#39393a;stop-opacity:1;"
          offset="0"
-         id="stop76471-7-1-5" />
+         id="stop3325" />
       <stop
-         style="stop-color:#3e4545;stop-opacity:1"
+         style="stop-color:#302f30;stop-opacity:1"
          offset="1"
-         id="stop76473-9-0-0" />
+         id="stop3327" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect77541-4"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect77541-4-0"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37802-8"
-       id="linearGradient12311-3-1-0-5-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.5918367,0,0,0.85714285,-256.56122,59.071426)"
-       x1="610.13782"
-       y1="501.43866"
-       x2="610.13782"
-       y2="492.52756" />
-    <linearGradient
-       id="linearGradient37802-8"
-       inkscape:collect="always">
-      <stop
-         id="stop37804-1"
-         offset="0"
-         style="stop-color:#2c2c2c;stop-opacity:1" />
-      <stop
-         id="stop37806-8"
-         offset="1"
-         style="stop-color:#16191a;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       y2="492.52756"
+       inkscape:collect="always"
-       x2="610.13782"
+       xlink:href="#linearGradient3329"
-       y1="501.43866"
+       id="linearGradient3331"
-       x1="610.13782"
+       x1="53"
-       gradientTransform="matrix(1.5918367,0,0,0.85714285,-900.56122,-423.92857)"
+       y1="294.42917"
+       x2="53"
+       y2="309.80417"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient13602"
+       gradientTransform="translate(-42.760724)" />
-       xlink:href="#linearGradient37802-8"
-       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="#000000"
+     pagecolor="#535353"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
      inkscape:zoom="1"
-     inkscape:cx="-5.0602834"
+     inkscape:cx="-19.436775"
-     inkscape:cy="16.473273"
+     inkscape:cy="-13.499723"
      inkscape:document-units="px"
-     inkscape:current-layer="g37994"
+     inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:window-width="2560"
+     units="px"
-     inkscape:window-height="1375"
+     inkscape:pagecheckerboard="true"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
      borderlayer="true"
      inkscape:showpageshadow="false"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true"
      showborder="false">
     <inkscape:grid
        type="xygrid"
-       id="grid12954"
+       id="grid3298" />
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
   </sodipodi:namedview>
   <metadata
-     id="metadata2862">
+     id="metadata2748">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -142,68 +80,24 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(-444.64286,-781.36218)">
+     transform="translate(0,-291.17916)">
-    <g
+    <rect
-       transform="matrix(0.6526046,0,0,0.80554422,99.592644,-636.32172)"
+       style="opacity:1;vector-effect:none;fill:#323233;fill-opacity:1;stroke:#272728;stroke-width:1.08532763;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"
-       id="g37994">
+       id="rect3296"
-      <g
+       width="44.446434"
-         id="g37996"
+       height="20.910645"
-         transform="translate(-115,1277)">
+       x="0.625"
-        <rect
+       y="291.71494"
-           style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964000000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.19591837"
+       rx="10.455324"
-           id="rect13475"
+       ry="10.073335" />
-           width="98"
+    <rect
-           height="25"
+       ry="10.455322"
-           x="644.5"
+       rx="10.455322"
-           y="484.61118"
+       y="291.71494"
-           rx="4.7429576"
+       x="0.5428465"
-           ry="3.8424656" />
+       height="20.910645"
-        <rect
+       width="21.142862"
-           ry="3.8424656"
+       id="rect3300"
-           rx="4.7429576"
+       style="opacity:1;vector-effect:none;fill:url(#linearGradient3331);fill-opacity:1;stroke:#151515;stroke-width:1.08532763;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" />
-           y="483.5"
-           x="644.5"
-           height="25"
-           width="98"
-           id="rect38000"
-           style="color:#000000;fill:url(#linearGradient12311-3-1-0-5-4);fill-opacity:1;fill-rule:nonzero;stroke:#16191a;stroke-width:1.37920942;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" />
-      </g>
-      <g
-         transform="translate(-49.946213,-1.890275)"
-         id="g38002">
-        <g
-           transform="translate(-115,1247)"
-           style="display:inline"
-           id="g38004">
-          <rect
-             ry="3.7972314"
-             rx="4.6871223"
-             y="515.5"
-             x="694.53046"
-             height="25"
-             width="45.969578"
-             id="rect38006"
-             style="color:#000000;fill:url(#linearGradient38024);fill-opacity:1;fill-rule:nonzero;stroke:#1f2020;stroke-width:1.37920964;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-          <path
-             sodipodi:nodetypes="cc"
-             style="opacity:0.1;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             d="m 699.09675,516.7365 36.86904,0"
-             id="path38016"
-             inkscape:path-effect="#path-effect77541-4"
-             inkscape:original-d="m 699.09675,516.7365 36.86904,0"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-      <path
-         sodipodi:type="arc"
-         style="color:#000000;fill:none;stroke:#ffffff;stroke-width:2.15627193;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-         id="path13479"
-         sodipodi:cx="16.4375"
-         sodipodi:cy="10.8125"
-         sodipodi:rx="4.3125"
-         sodipodi:ry="4.3125"
-         d="m 20.75,10.8125 a 4.3125,4.3125 0 1 1 -8.625,0 4.3125,4.3125 0 1 1 8.625,0 z"
-         transform="matrix(1.4212691,0,0,1.1514287,577.38488,1761.1138)" />
-    </g>
   </g>
 </svg>

data/theme/toggle-off-us.svg

@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="65"
-   height="22"
-   id="svg2857"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="toggle-on-intl.svg">
-  <defs
-     id="defs2859">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2865" />
-    <inkscape:perspective
-       id="perspective2843"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76469-7-7-4"
-       id="linearGradient38024"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0215462,0,0,1.0322581,717.22867,428.68472)"
-       x1="6"
-       y1="102.95528"
-       x2="6"
-       y2="84.505203" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient76469-7-7-4">
-      <stop
-         style="stop-color:#2e3232;stop-opacity:1"
-         offset="0"
-         id="stop76471-7-1-5" />
-      <stop
-         style="stop-color:#3e4545;stop-opacity:1"
-         offset="1"
-         id="stop76473-9-0-0" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect77541-4"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37802"
-       id="linearGradient12311-3-1-0-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.5918367,0,0,0.85714285,-256.56122,59.071426)"
-       x1="610.13782"
-       y1="501.43866"
-       x2="610.13782"
-       y2="492.52756" />
-    <linearGradient
-       id="linearGradient37802"
-       inkscape:collect="always">
-      <stop
-         id="stop37804"
-         offset="0"
-         style="stop-color:#2c2c2c;stop-opacity:1" />
-      <stop
-         id="stop37806"
-         offset="1"
-         style="stop-color:#16191a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76469-7-7-4-3"
-       id="linearGradient77680"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.0322581,717.71949,428.68472)"
-       x1="6"
-       y1="102.95528"
-       x2="6"
-       y2="84.505203" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient76469-7-7-4-3">
-      <stop
-         style="stop-color:#2e3232;stop-opacity:1"
-         offset="0"
-         id="stop76471-7-1-5-7" />
-      <stop
-         style="stop-color:#3e4545;stop-opacity:1"
-         offset="1"
-         id="stop76473-9-0-0-9" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect77541-4-0"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37802-8"
-       id="linearGradient12311-3-1-0-5-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.5918367,0,0,0.85714285,-256.56122,59.071426)"
-       x1="610.13782"
-       y1="501.43866"
-       x2="610.13782"
-       y2="492.52756" />
-    <linearGradient
-       id="linearGradient37802-8"
-       inkscape:collect="always">
-      <stop
-         id="stop37804-1"
-         offset="0"
-         style="stop-color:#2c2c2c;stop-opacity:1" />
-      <stop
-         id="stop37806-8"
-         offset="1"
-         style="stop-color:#16191a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       y2="492.52756"
-       x2="610.13782"
-       y1="501.43866"
-       x1="610.13782"
-       gradientTransform="matrix(1.5918367,0,0,0.85714285,-900.56122,-423.92857)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient13602"
-       xlink:href="#linearGradient37802-8"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="16.760995"
-     inkscape:cy="21.955673"
-     inkscape:document-units="px"
-     inkscape:current-layer="g37994"
-     showgrid="false"
-     inkscape:window-width="2560"
-     inkscape:window-height="1375"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true"
-     showborder="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid12954"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2862">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-444.64286,-781.36218)">
-    <g
-       transform="matrix(0.6526046,0,0,0.80554422,99.592644,-636.32172)"
-       id="g37994">
-      <g
-         id="g37996"
-         transform="translate(-115,1277)">
-        <rect
-           style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964000000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.19591837"
-           id="rect13475"
-           width="98"
-           height="25"
-           x="644.5"
-           y="484.61118"
-           rx="4.7429576"
-           ry="3.8424656" />
-        <rect
-           ry="3.8424656"
-           rx="4.7429576"
-           y="483.5"
-           x="644.5"
-           height="25"
-           width="98"
-           id="rect38000"
-           style="color:#000000;fill:url(#linearGradient12311-3-1-0-5-4);fill-opacity:1;fill-rule:nonzero;stroke:#16191a;stroke-width:1.37920942;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" />
-      </g>
-      <g
-         transform="translate(-49.946213,-1.890275)"
-         id="g38002">
-        <g
-           transform="translate(-115,1247)"
-           style="display:inline"
-           id="g38004">
-          <rect
-             ry="3.7972314"
-             rx="4.6871223"
-             y="515.5"
-             x="694.53046"
-             height="25"
-             width="45.969578"
-             id="rect38006"
-             style="color:#000000;fill:url(#linearGradient38024);fill-opacity:1;fill-rule:nonzero;stroke:#1f2020;stroke-width:1.37920964;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-          <path
-             sodipodi:nodetypes="cc"
-             style="opacity:0.1;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             d="m 699.09675,516.7365 36.86904,0"
-             id="path38016"
-             inkscape:path-effect="#path-effect77541-4"
-             inkscape:original-d="m 699.09675,516.7365 36.86904,0"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-      <text
-         xml:space="preserve"
-         style="font-size:13.79166794px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
-         x="520.29974"
-         y="1997.0011"
-         id="text75614"
-         sodipodi:linespacing="125%"
-         transform="scale(1.1236771,0.88993537)"><tspan
-           sodipodi:role="line"
-           id="tspan75616"
-           x="520.29974"
-           y="1997.0011">OFF</tspan></text>
-    </g>
-  </g>
-</svg>

data/theme/toggle-on-intl.svg

@@ -10,117 +10,69 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="65"
+   width="46"
    height="22"
-   id="svg2857"
+   viewBox="0 0 46 22"
    version="1.1"
-   inkscape:version="0.91 r13725"
+   id="svg2751"
+   inkscape:version="0.92.4 5da689c313, 2019-01-14"
    sodipodi:docname="toggle-on-intl.svg">
   <defs
-     id="defs2859">
+     id="defs2745">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2865" />
-    <inkscape:perspective
-       id="perspective2843"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient77461"
+       id="linearGradient3329">
-       id="linearGradient77551"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3066667,0,0,1,-841.64667,-483)"
-       x1="1164.7644"
-       y1="962.93695"
-       x2="1164.7644"
-       y2="970.51404" />
-    <linearGradient
-       id="linearGradient77461"
-       inkscape:collect="always">
       <stop
-         id="stop77463"
+         style="stop-color:#39393a;stop-opacity:1;"
          offset="0"
-         style="stop-color:#182f4c;stop-opacity:1" />
+         id="stop3325" />
       <stop
-         id="stop77465"
+         style="stop-color:#302f30;stop-opacity:1"
          offset="1"
-         style="stop-color:#205b9a;stop-opacity:1" />
+         id="stop3327" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient76469-7-7-4"
+       xlink:href="#linearGradient3329"
-       id="linearGradient38024"
+       id="linearGradient3331"
+       x1="53"
+       y1="294.42917"
+       x2="53"
+       y2="309.80417"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0215462,0,0,1.0322581,717.22867,428.68472)"
+       gradientTransform="translate(-19)" />
-       x1="6"
-       y1="102.95528"
-       x2="6"
-       y2="84.505203" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient76469-7-7-4">
-      <stop
-         style="stop-color:#2e3232;stop-opacity:1"
-         offset="0"
-         id="stop76471-7-1-5" />
-      <stop
-         style="stop-color:#3e4545;stop-opacity:1"
-         offset="1"
-         id="stop76473-9-0-0" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect77541-4"
-       is_visible="true" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="#000000"
+     pagecolor="#535353"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
      inkscape:zoom="1"
-     inkscape:cx="37.410841"
+     inkscape:cx="13.588971"
-     inkscape:cy="16.009314"
+     inkscape:cy="14.124546"
      inkscape:document-units="px"
-     inkscape:current-layer="g37994"
+     inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:window-width="2560"
+     units="px"
-     inkscape:window-height="1376"
+     inkscape:pagecheckerboard="true"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
      borderlayer="true"
      inkscape:showpageshadow="false"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true"
      showborder="false">
     <inkscape:grid
        type="xygrid"
-       id="grid12954"
+       id="grid3298" />
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
   </sodipodi:namedview>
   <metadata
-     id="metadata2862">
+     id="metadata2748">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -128,65 +80,24 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(-444.64286,-781.36218)">
+     transform="translate(0,-291.17916)">
-    <g
+    <rect
-       transform="matrix(0.6526046,0,0,0.80554422,99.592644,-636.32172)"
+       style="opacity:1;vector-effect:none;fill:#15539e;fill-opacity:1;stroke:#030e1b;stroke-width:1.08532763;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"
-       id="g37994">
+       id="rect3296"
-      <g
+       width="44.446434"
-         id="g37996"
+       height="20.910645"
-         transform="translate(-115,1277)">
+       x="0.625"
-        <rect
+       y="291.71494"
-           style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964000000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.19591837"
+       rx="10.455324"
-           id="rect13475"
+       ry="10.073335" />
-           width="98"
+    <rect
-           height="25"
+       ry="10.455322"
-           x="644.5"
+       rx="10.455322"
-           y="484.61118"
+       y="291.71494"
-           rx="4.7429576"
+       x="24.30357"
-           ry="3.8424656" />
+       height="20.910645"
-        <rect
+       width="21.142862"
-           ry="3.8424656"
+       id="rect3300"
-           rx="4.7429576"
+       style="opacity:1;vector-effect:none;fill:url(#linearGradient3331);fill-opacity:1;stroke:#030e1b;stroke-width:1.08532763;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" />
-           y="483.5"
-           x="644.5"
-           height="25"
-           width="98"
-           id="rect38000"
-           style="color:#000000;fill:url(#linearGradient77551);fill-opacity:1;fill-rule:nonzero;stroke:#182f4c;stroke-width:1.37920964;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      </g>
-      <g
-         transform="translate(2.0625,-2)"
-         id="g38002">
-        <g
-           transform="translate(-115,1247)"
-           style="display:inline"
-           id="g38004">
-          <rect
-             ry="3.7972314"
-             rx="4.6871223"
-             y="515.5"
-             x="694.53046"
-             height="25"
-             width="45.969578"
-             id="rect38006"
-             style="color:#000000;fill:url(#linearGradient38024);fill-opacity:1;fill-rule:nonzero;stroke:#1f2020;stroke-width:1.37920964;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-          <path
-             sodipodi:nodetypes="cc"
-             style="opacity:0.1;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             d="m 699.09675,516.7365 36.86904,0"
-             id="path38016"
-             inkscape:path-effect="#path-effect77541-4"
-             inkscape:original-d="m 699.09675,516.7365 36.86904,0"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-      <rect
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-         id="rect13678"
-         width="3.0646207"
-         height="12.414008"
-         x="554.77728"
-         y="1767.3566" />
-    </g>
   </g>
 </svg>

data/theme/toggle-on-us.svg

@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="65"
-   height="22"
-   id="svg2857"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="toggle-on-us.svg">
-  <defs
-     id="defs2859">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2865" />
-    <inkscape:perspective
-       id="perspective2843"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76469-7-7-4"
-       id="linearGradient38024"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0215462,0,0,1.0322581,717.22867,428.68472)"
-       x1="6"
-       y1="102.95528"
-       x2="6"
-       y2="84.505203" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient76469-7-7-4">
-      <stop
-         style="stop-color:#2e3232;stop-opacity:1"
-         offset="0"
-         id="stop76471-7-1-5" />
-      <stop
-         style="stop-color:#3e4545;stop-opacity:1"
-         offset="1"
-         id="stop76473-9-0-0" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect77541-4"
-       is_visible="true" />
-    <linearGradient
-       id="linearGradient77461-1"
-       inkscape:collect="always">
-      <stop
-         id="stop77463-1"
-         offset="0"
-         style="stop-color:#182f4c;stop-opacity:1" />
-      <stop
-         id="stop77465-4"
-         offset="1"
-         style="stop-color:#205b9a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient77461-1"
-       id="linearGradient77551-6-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.8527367,0,0,0.80554422,-969.41608,-778.00299)"
-       x1="1164.7644"
-       y1="962.93695"
-       x2="1164.7644"
-       y2="970.51404" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient77461-1"
-       id="linearGradient11198"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3066667,0,0,1,-1066.3709,794.25325)"
-       x1="1322.5831"
-       y1="-312.51855"
-       x2="1322.5831"
-       y2="-306.53461" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="-26.798898"
-     inkscape:cy="5.3753009"
-     inkscape:document-units="px"
-     inkscape:current-layer="g37994"
-     showgrid="false"
-     inkscape:window-width="2560"
-     inkscape:window-height="1376"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true"
-     showborder="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid12954"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2862">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-444.64286,-781.36218)">
-    <g
-       transform="matrix(0.6526046,0,0,0.80554422,99.592644,-636.32172)"
-       id="g37994">
-      <g
-         id="g37996"
-         transform="translate(-115,1277)">
-        <rect
-           style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964000000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.19591837"
-           id="rect13475"
-           width="98"
-           height="25"
-           x="644.5"
-           y="484.61118"
-           rx="4.7429576"
-           ry="3.8424656" />
-        <rect
-           ry="3.8424656"
-           rx="4.7429576"
-           y="483.5"
-           x="644.5"
-           height="25"
-           width="98"
-           id="rect38000"
-           style="color:#000000;fill:url(#linearGradient11198);fill-opacity:1;fill-rule:nonzero;stroke:#182f4c;stroke-width:1.37920964;stroke-linecap:round;stroke-linejoin:miter;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;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" />
-      </g>
-      <g
-         transform="translate(2.0625,-2)"
-         id="g38002">
-        <g
-           transform="translate(-115,1247)"
-           style="display:inline"
-           id="g38004">
-          <rect
-             ry="3.7972314"
-             rx="4.6871223"
-             y="515.5"
-             x="694.53046"
-             height="25"
-             width="45.969578"
-             id="rect38006"
-             style="color:#000000;fill:url(#linearGradient38024);fill-opacity:1;fill-rule:nonzero;stroke:#1f2020;stroke-width:1.37920964;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-          <path
-             sodipodi:nodetypes="cc"
-             style="opacity:0.1;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             d="m 699.09675,516.7365 36.86904,0"
-             id="path38016"
-             inkscape:path-effect="#path-effect77541-4"
-             inkscape:original-d="m 699.09675,516.7365 36.86904,0"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-      <text
-         transform="scale(1.1000946,0.90901274)"
-         sodipodi:linespacing="125%"
-         id="text38018"
-         y="1955.5205"
-         x="495.94223"
-         style="font-size:13.29953671px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
-         xml:space="preserve"><tspan
-           y="1955.5205"
-           x="495.94223"
-           id="tspan38020"
-           sodipodi:role="line">ON</tspan></text>
-    </g>
-  </g>
-</svg>

js/ui/barLevel.js

@@ -121,7 +121,8 @@ var BarLevel = class {
         cr.lineTo(x, (height - barLevelHeight) / 2);
         cr.lineTo(x, (height + barLevelHeight) / 2);
         cr.lineTo(barLevelBorderRadius + barLevelBorderWidth, (height + barLevelHeight) / 2);
-        Clutter.cairo_set_source_color(cr, barLevelActiveColor);
+        if (this._value > 0)
+          Clutter.cairo_set_source_color(cr, barLevelActiveColor);
         cr.fillPreserve();
         Clutter.cairo_set_source_color(cr, barLevelActiveBorderColor);
         cr.setLineWidth(barLevelBorderWidth);
@@ -143,17 +144,19 @@ var BarLevel = class {
         }
 
         /* end progress bar arc */
-        if (this._value <= this._overdriveStart)
+        if (this._value > 0) {
-            Clutter.cairo_set_source_color(cr, barLevelActiveColor);
+          if (this._value <= this._overdriveStart)
-        else
+              Clutter.cairo_set_source_color(cr, barLevelActiveColor);
-            Clutter.cairo_set_source_color(cr, barLevelOverdriveColor);
+          else
-        cr.arc(endX, height / 2, barLevelBorderRadius, TAU * 3 / 4, TAU * 1 / 4);
+              Clutter.cairo_set_source_color(cr, barLevelOverdriveColor);
-        cr.lineTo(Math.floor(endX), (height + barLevelHeight) / 2);
+          cr.arc(endX, height / 2, barLevelBorderRadius, TAU * 3 / 4, TAU * 1 / 4);
-        cr.lineTo(Math.floor(endX), (height - barLevelHeight) / 2);
+          cr.lineTo(Math.floor(endX), (height + barLevelHeight) / 2);
-        cr.lineTo(endX, (height - barLevelHeight) / 2);
+          cr.lineTo(Math.floor(endX), (height - barLevelHeight) / 2);
-        cr.fillPreserve();
+          cr.lineTo(endX, (height - barLevelHeight) / 2);
-        cr.setLineWidth(barLevelBorderWidth);
+          cr.fillPreserve();
-        cr.stroke();
+          cr.setLineWidth(barLevelBorderWidth);
+          cr.stroke();
+        }
 
         /* draw overdrive separator */
         if (overdriveActive) {

js/ui/popupMenu.js

@@ -277,12 +277,6 @@ var Switch = class {
         this.actor = new St.Bin({ style_class: 'toggle-switch',
                                   accessible_role: Atk.Role.CHECK_BOX,
                                   can_focus: true });
-        // Translators: this MUST be either "toggle-switch-us"
-        // (for toggle switches containing the English words
-        // "ON" and "OFF") or "toggle-switch-intl" (for toggle
-        // switches containing "◯" and "|"). Other values will
-        // simply result in invisible toggle switches.
-        this.actor.add_style_class_name(_("toggle-switch-us"));
         this.setToggleState(state);
     }
 

js/ui/windowManager.js

@@ -1488,8 +1488,13 @@ var WindowManager = class {
         if (this._clearAnimationInfo(actor))
             this._shellwm.completed_size_change(actor);
 
+        let destroyId = actor.connect('destroy', () => {
+            this._clearAnimationInfo(actor);
+        });
+
         actor.__animationInfo = { clone: actorClone,
-                                  oldRect: oldFrameRect };
+                                  oldRect: oldFrameRect,
+                                  destroyId: destroyId };
     }
 
     _sizeChangedWindow(shellwm, actor) {
@@ -1550,6 +1555,7 @@ var WindowManager = class {
     _clearAnimationInfo(actor) {
         if (actor.__animationInfo) {
             actor.__animationInfo.clone.destroy();
+            actor.disconnect(actor.__animationInfo.destroyId);
             delete actor.__animationInfo;
             return true;
         }

meson.build

@@ -1,5 +1,5 @@
 project('gnome-shell', 'c',
-  version: '3.32.0',
+  version: '3.32.1',
   meson_version: '>= 0.47.0',
   license: 'GPLv2+'
 )

src/st/st-theme-node.c

@@ -1136,10 +1136,14 @@ get_length_from_term_int (StThemeNode *node,
 {
   double value;
   GetFromTermResult result;
+  int scale_factor;
 
   result = get_length_from_term (node, term, use_parent_font, &value);
   if (result == VALUE_FOUND)
-    *length = (int) (0.5 + value);
+    {
+      g_object_get (node->context, "scale-factor", &scale_factor, NULL);
+      *length = (int) ((value / scale_factor) + 0.5) * scale_factor;
+    }
   return result;
 }