From 28c2a6e528fbc003c61f3408b30c110ca72ca55d Mon Sep 17 00:00:00 2001
From: Tobias Bernard <tbernard@gnome.org>
Date: Wed, 7 Jul 2021 18:23:18 +0200
Subject: symbolic: add ascending/descending sorting, simplify unmaximize

---
 Adwaita/scalable/actions/view-restore-symbolic.svg |  18 +--
 .../actions/view-sort-ascending-symbolic.svg       |  10 +-
 .../actions/view-sort-descending-symbolic.svg      |  10 +-
 src/symbolic/core.svg                              | 155 +++++++++++++++------
 4 files changed, 144 insertions(+), 49 deletions(-)

diff --git a/Adwaita/scalable/actions/view-restore-symbolic.svg b/Adwaita/scalable/actions/view-restore-symbolic.svg
index 4ac6e624e..1f0619255 100644
--- a/Adwaita/scalable/actions/view-restore-symbolic.svg
+++ b/Adwaita/scalable/actions/view-restore-symbolic.svg
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
     <g fill="#2e3436">
-        <path d="m 14.984375 4 h -2.988281 l -0.007813 -3.003906 l -2 0.007812 l 0.015625 4.996094 h 4.980469 z m 0 0"/>
-        <path d="m 15.988281 1 c -0.003906 -0.265625 -0.109375 -0.523438 -0.296875 -0.707031 c -0.390625 -0.3906252 -1.023437 -0.3906252 -1.414062 0.003906 l -3.984375 4 c -0.390625 0.390625 -0.390625 1.023437 0 1.414063 c 0.390625 0.386718 1.023437 0.386718 1.414062 -0.003907 l 3.988281 -4 c 0.1875 -0.1875 0.292969 -0.445312 0.292969 -0.707031 z m 0 0"/>
-        <path d="m 9 7 h -8 v 3 h 8 z m 0 0" fill-rule="evenodd"/>
-        <path d="m 14.984375 5 h 1 v 1 h -1 z m 0 0"/>
-        <path d="m 9.984375 0 h 1 v 1 h -1 z m 0 0"/>
-        <path d="m 10.984375 0 c 0.554687 0 1 0.449219 1 1 s -0.445313 1 -1 1 c -0.550781 0 -1 -0.449219 -1 -1 s 0.449219 -1 1 -1 z m 0 0"/>
-        <path d="m 14.984375 4 c 0.554687 0 1 0.449219 1 1 s -0.445313 1 -1 1 c -0.550781 0 -1 -0.449219 -1 -1 s 0.449219 -1 1 -1 z m 0 0"/>
-        <path d="m 2 6 c -1.089844 0 -2 0.910156 -2 2 v 6 c 0 1.089844 0.910156 2 2 2 h 6 c 1.089844 0 2 -0.910156 2 -2 v -6 c 0 -1.089844 -0.910156 -2 -2 -2 z m 0 2 h 6 v 6 h -6 z m 0 0"/>
+        <path d="m 1 9 c 0 0.550781 0.449219 1 1 1 h 4 v 4 c 0 0.550781 0.449219 1 1 1 c 0.554688 0 1 -0.449219 1 -1 v -5 c 0 -0.554688 -0.445312 -1 -1 -1 h -5 c -0.550781 0 -1 0.445312 -1 1 z m 0 0"/>
+        <path d="m 0.5 14.5 c 0 0.265625 0.105469 0.519531 0.292969 0.707031 c 0.390625 0.390625 1.023437 0.390625 1.414062 0 l 5.5 -5.5 c 0.1875 -0.1875 0.292969 -0.441406 0.292969 -0.707031 s -0.105469 -0.519531 -0.292969 -0.707031 c -0.390625 -0.390625 -1.023437 -0.390625 -1.414062 0 l -5.5 5.5 c -0.1875 0.1875 -0.292969 0.441406 -0.292969 0.707031 z m 0 0"/>
+        <path d="m 8 9 h -1 v -1 h 1 z m 0 0"/>
+        <path d="m 8 15 h -1 v -1 h 1 z m 0 0"/>
+        <path d="m 2 9 h -1 v -1 h 1 z m 0 0"/>
+        <path d="m 15 7 c 0 -0.550781 -0.449219 -1 -1 -1 h -4 v -4 c 0 -0.550781 -0.449219 -1 -1 -1 s -1 0.449219 -1 1 v 5 c 0 0.550781 0.449219 1 1 1 h 5 c 0.550781 0 1 -0.449219 1 -1 z m 0 0"/>
+        <path d="m 15.5 1.5 c 0 -0.265625 -0.105469 -0.519531 -0.292969 -0.707031 c -0.390625 -0.390625 -1.023437 -0.390625 -1.414062 0 l -5.5 5.5 c -0.1875 0.1875 -0.292969 0.441406 -0.292969 0.707031 s 0.105469 0.519531 0.292969 0.707031 c 0.390625 0.390625 1.023437 0.390625 1.414062 0 l 5.5 -5.5 c 0.1875 -0.1875 0.292969 -0.441406 0.292969 -0.707031 z m 0 0"/>
+        <path d="m 8 7 h 1 v 1 h -1 z m 0 0"/>
+        <path d="m 8 1 h 1 v 1 h -1 z m 0 0"/>
+        <path d="m 14 7 h 1 v 1 h -1 z m 0 0"/>
     </g>
 </svg>
diff --git a/Adwaita/scalable/actions/view-sort-ascending-symbolic.svg b/Adwaita/scalable/actions/view-sort-ascending-symbolic.svg
index 5909c865c..9d90d7a31 100644
--- a/Adwaita/scalable/actions/view-sort-ascending-symbolic.svg
+++ b/Adwaita/scalable/actions/view-sort-ascending-symbolic.svg
@@ -1 +1,9 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M1.384 3h1.231A.38.38 0 013 3.379V4.62a.38.38 0 01-.385.38h-1.23A.38.38 0 011 4.621V3.38A.38.38 0 011.384 3zm0 4.016h1.231A.38.38 0 013 7.394v1.243a.38.38 0 01-.385.379h-1.23A.38.38 0 011 8.636V7.395a.38.38 0 01.384-.378zm0 3.984h1.231a.38.38 0 01.385.379v1.242a.38.38 0 01-.385.379h-1.23A.38.38 0 011 12.621V11.38a.38.38 0 01.384-.38zM7 3v4H3.937l5.125 5.781L14.187 7H11V3z" style="marker:none" overflow="visible" color="#000" fill="#474747"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
+    <g fill="#2e3436">
+        <path d="m 2 1 h 2 c 0.550781 0 1 0.449219 1 1 v 2 c 0 0.550781 -0.449219 1 -1 1 h -2 c -0.550781 0 -1 -0.449219 -1 -1 v -2 c 0 -0.550781 0.449219 -1 1 -1 z m 0 0"/>
+        <path d="m 9 2 v 7 h -3.0625 l 5.125 5.78125 l 5.125 -5.78125 h -3.1875 v -7 z m 0 0"/>
+        <path d="m 2 6 h 2 c 0.550781 0 1 0.449219 1 1 v 2 c 0 0.550781 -0.449219 1 -1 1 h -2 c -0.550781 0 -1 -0.449219 -1 -1 v -2 c 0 -0.550781 0.449219 -1 1 -1 z m 0 0"/>
+        <path d="m 2 11 h 2 c 0.550781 0 1 0.449219 1 1 v 2 c 0 0.550781 -0.449219 1 -1 1 h -2 c -0.550781 0 -1 -0.449219 -1 -1 v -2 c 0 -0.550781 0.449219 -1 1 -1 z m 0 0"/>
+    </g>
+</svg>
diff --git a/Adwaita/scalable/actions/view-sort-descending-symbolic.svg b/Adwaita/scalable/actions/view-sort-descending-symbolic.svg
index 8cb410eff..a02b00a43 100644
--- a/Adwaita/scalable/actions/view-sort-descending-symbolic.svg
+++ b/Adwaita/scalable/actions/view-sort-descending-symbolic.svg
@@ -1 +1,9 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M1.384 3h1.231A.38.38 0 013 3.379V4.62a.38.38 0 01-.385.38h-1.23A.38.38 0 011 4.621V3.38A.38.38 0 011.384 3zm0 4.016h1.231A.38.38 0 013 7.394v1.243a.38.38 0 01-.385.379h-1.23A.38.38 0 011 8.636V7.395a.38.38 0 01.384-.378zm0 3.984h1.231a.38.38 0 01.385.379v1.242a.38.38 0 01-.385.379h-1.23A.38.38 0 011 12.621V11.38a.38.38 0 01.384-.38zM7 12.781v-4H3.937L9.062 3l5.125 5.781H11v4z" style="marker:none" overflow="visible" color="#000" fill="#474747"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="16px" viewBox="0 0 16.1875 16" width="16.1875px" xmlns="http://www.w3.org/2000/svg">
+    <g fill="#2e3436">
+        <path d="m 2 15 h 2 c 0.550781 0 1 -0.449219 1 -1 v -2 c 0 -0.550781 -0.449219 -1 -1 -1 h -2 c -0.550781 0 -1 0.449219 -1 1 v 2 c 0 0.550781 0.449219 1 1 1 z m 0 0"/>
+        <path d="m 9 14 v -7 h -3.0625 l 5.125 -5.78125 l 5.125 5.78125 h -3.1875 v 7 z m 0 0"/>
+        <path d="m 2 10 h 2 c 0.550781 0 1 -0.449219 1 -1 v -2 c 0 -0.550781 -0.449219 -1 -1 -1 h -2 c -0.550781 0 -1 0.449219 -1 1 v 2 c 0 0.550781 0.449219 1 1 1 z m 0 0"/>
+        <path d="m 2 5 h 2 c 0.550781 0 1 -0.449219 1 -1 v -2 c 0 -0.550781 -0.449219 -1 -1 -1 h -2 c -0.550781 0 -1 0.449219 -1 1 v 2 c 0 0.550781 0.449219 1 1 1 z m 0 0"/>
+    </g>
+</svg>
diff --git a/src/symbolic/core.svg b/src/symbolic/core.svg
index 03d3db985..2b80acfc3 100644
--- a/src/symbolic/core.svg
+++ b/src/symbolic/core.svg
@@ -41,9 +41,9 @@
      inkscape:window-height="1011"
      id="namedview88"
      showgrid="false"
-     inkscape:zoom="4.0786281"
-     inkscape:cx="142.57245"
-     inkscape:cy="266.02082"
+     inkscape:zoom="1.4050379"
+     inkscape:cx="242.34221"
+     inkscape:cy="343.05124"
      inkscape:window-x="0"
      inkscape:window-y="0"
      inkscape:window-maximized="1"
@@ -1798,62 +1798,79 @@
          id="rect104273"
          style="fill:none" />
       <g
-         id="g104438"
-         transform="translate(1.6730985,-1.5890043)">
-        <path
-           style="color:#000000;fill:#2e3436;-inkscape-stroke:none"
-           d="m 165.46289,197.60742 v 2.98828 l -3.00391,0.01 0.008,2 4.99609,-0.0176 v -4.98047 z"
-           id="path12113-8" />
+         id="g97689-3"
+         transform="rotate(180,170.97956,205.25317)"
+         style="display:inline">
         <path
            style="color:#000000;fill:#2e3436;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none"
-           d="m 162.46094,196.60547 a 1,1 0 0 0 -0.70703,0.29492 1,1 0 0 0 0.004,1.41406 l 4,3.98633 a 1,1 0 0 0 1.41406,-0.002 1,1 0 0 0 -0.004,-1.41406 l -4,-3.98633 a 1,1 0 0 0 -0.70703,-0.29297 z"
-           id="path12147-8" />
+           d="m 169.82422,200.50391 a 1,1 0 0 0 -1,1 v 4 h -4 a 1,1 0 0 0 -1,1 1,1 0 0 0 1,1 h 5 a 1.0001,1.0001 0 0 0 1,-1 v -5 a 1,1 0 0 0 -1,-1 z"
+           id="path97679-6" />
         <path
-           style="color:#000000;fill:#2e3436;fill-rule:evenodd;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none"
-           d="m 168.46289,203.59142 v 8.00075 h 3 v -8.00075 z"
-           id="path13041"
-           sodipodi:nodetypes="ccccc" />
+           style="color:#000000;fill:#2e3436;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none"
+           d="m 164.32422,200.00391 a 1,1 0 0 0 -0.70899,0.29296 1,1 0 0 0 0,1.41407 l 5.5,5.5 a 1,1 0 0 0 1.41602,0 1,1 0 0 0 0,-1.41407 l -5.5,-5.5 a 1,1 0 0 0 -0.70703,-0.29296 z"
+           id="path97681-7" />
+        <rect
+           y="169.8233"
+           x="-207.50317"
+           height="1"
+           width="1"
+           id="rect97683-5"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:new"
+           transform="rotate(-90)" />
         <rect
            style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
-           id="rect4479-2-9-9-0-8-6"
+           id="rect97685-3"
            width="1"
            height="1"
-           x="-197.60641"
-           y="166.46271"
+           x="-207.50317"
+           y="163.8233"
            transform="rotate(-90)" />
         <rect
            style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
-           id="rect4479-2-9-9-0-8-6-6"
+           id="rect97687-5"
            width="1"
            height="1"
-           x="-202.60641"
-           y="161.46271"
+           x="-201.50317"
+           y="169.8233"
+           transform="rotate(-90)" />
+      </g>
+      <g
+         id="g2622"
+         transform="translate(0.31173856,-4.500735)"
+         style="display:inline">
+        <path
+           style="color:#000000;fill:#2e3436;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none"
+           d="m 169.82422,200.50391 a 1,1 0 0 0 -1,1 v 4 h -4 a 1,1 0 0 0 -1,1 1,1 0 0 0 1,1 h 5 a 1.0001,1.0001 0 0 0 1,-1 v -5 a 1,1 0 0 0 -1,-1 z"
+           id="path2612" />
+        <path
+           style="color:#000000;fill:#2e3436;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none"
+           d="m 164.32422,200.00391 a 1,1 0 0 0 -0.70899,0.29296 1,1 0 0 0 0,1.41407 l 5.5,5.5 a 1,1 0 0 0 1.41602,0 1,1 0 0 0 0,-1.41407 l -5.5,-5.5 a 1,1 0 0 0 -0.70703,-0.29296 z"
+           id="path2614" />
+        <rect
+           y="169.8233"
+           x="-207.50317"
+           height="1"
+           width="1"
+           id="rect2616"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:new"
            transform="rotate(-90)" />
         <rect
-           y="161.46271"
-           x="-202.60641"
-           height="2.00001"
-           width="2.0000021"
-           id="rect3983"
            style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
-           ry="1.0000011"
-           rx="1.0000011"
+           id="rect2618"
+           width="1"
+           height="1"
+           x="-207.50317"
+           y="163.8233"
            transform="rotate(-90)" />
         <rect
-           ry="1.0000011"
            style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
-           id="rect3985"
-           width="2.0000021"
-           height="2.00001"
-           x="-198.60641"
-           y="165.46271"
-           rx="1.0000011"
+           id="rect2620"
+           width="1"
+           height="1"
+           x="-201.50317"
+           y="169.8233"
            transform="rotate(-90)" />
       </g>
-      <path
-         style="color:#000000;display:inline;fill:#2e3436;stroke-linejoin:round;stroke-dashoffset:26.4;-inkscape-stroke:none"
-         d="m 169.13581,209.00317 c 0,1.0907 0.9093,2 2,2 h 6 c 1.0907,0 2,-0.9093 2,-2 v -6 c 0,-1.0907 -0.9093,-2 -2,-2 h -6 c -1.0907,0 -2,0.9093 -2,2 z m 2,0 v -6 h 6 v 6 z"
-         id="rect39391" />
     </g>
     <g
        style="display:inline"
@@ -3479,6 +3496,54 @@
          rx="0.5"
          ry="0.5" />
     </g>
+    <g
+       style="display:inline;enable-background:new"
+       inkscape:label="view sort ascending alphabetic"
+       id="g20737"
+       transform="translate(258.99942,-836.99988)">
+      <title
+         id="title4227">view-sort-ascending</title>
+      <rect
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#888a85;fill-opacity:0;stroke:none;stroke-width:1;marker:none"
+         id="rect20739"
+         width="16"
+         height="16"
+         x="41.000401"
+         y="867" />
+      <rect
+         y="868"
+         x="42.00058"
+         height="3.9999979"
+         id="rect20747"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.999999;marker:none;enable-background:new"
+         width="3.9993291"
+         rx="1"
+         ry="1" />
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:new"
+         d="m 50.0002,869 v 7 h -3.0625 l 5.125,5.78125 L 57.1877,876 h -3.1875 v -7 z"
+         id="rect20753"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccc" />
+      <rect
+         y="872.99988"
+         x="42.00058"
+         height="4.0001178"
+         id="rect4612"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:new"
+         width="3.999449"
+         rx="1"
+         ry="1" />
+      <rect
+         y="877.99988"
+         x="42.00058"
+         height="4.0000019"
+         id="rect4614"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:new"
+         width="3.9993331"
+         rx="1"
+         ry="1" />
+    </g>
     <g
        style="display:inline;enable-background:new"
        id="g7797-1"
@@ -3929,6 +3994,18 @@
          transform="translate(237.13496,-574.1521)"
          sodipodi:nodetypes="cccscccc" />
     </g>
+    <use
+       x="0"
+       y="0"
+       xlink:href="#g20737"
+       id="use12234"
+       transform="matrix(1,0,0,-1,20,76.00024)"
+       width="100%"
+       height="100%"
+       inkscape:label="view sort decending alphabetic">
+      <title
+         id="title12236">view-sort-descending</title>
+    </use>
   </g>
   <text
      xml:space="preserve"
-- 
cgit v1.2.1