From 2bf2d4f91021705f5c893479cb08d2e09ad4ebd9 Mon Sep 17 00:00:00 2001
From: snoutie <71790678+SnoutBug@users.noreply.github.com>
Date: Mon, 25 Jul 2022 21:36:27 +0200
Subject: [PATCH 1/2] Add Ciliora Round and Dashes Round (Capsules)

---
 Settings.ui |  2 ++
 appIcons.js | 39 +++++++++++++++++++++++++++++++++++++--
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/Settings.ui b/Settings.ui
index 382b0368..8a3dcb5e 100644
--- a/Settings.ui
+++ b/Settings.ui
@@ -4888,9 +4888,11 @@
                                       <item id="DOTS" translatable="yes">Dots</item>
                                       <item id="SQUARES" translatable="yes">Squares</item>
                                       <item id="DASHES" translatable="yes">Dashes</item>
+                                      <item id="CAPSULES" translatable="yes">Capsules</item>
                                       <item id="SEGMENTED" translatable="yes">Segmented</item>
                                       <item id="SOLID" translatable="yes">Solid</item>
                                       <item id="CILIORA" translatable="yes">Ciliora</item>
+                                      <item id="CILIORAROUND" translatable="yes">Ciliora Round</item>
                                       <item id="METRO" translatable="yes">Metro</item>
                                     </items>
                                   </object>
diff --git a/appIcons.js b/appIcons.js
index ab0d22b6..08a65315 100644
--- a/appIcons.js
+++ b/appIcons.js
@@ -77,8 +77,10 @@ let DOT_STYLE = {
     DOTS: "DOTS",
     SQUARES: "SQUARES",
     DASHES: "DASHES",
+    CAPSULES: "CAPSULES",
     SEGMENTED: "SEGMENTED",
     CILIORA: "CILIORA",
+    CILIORAROUND: "CILIORAROUND",
     METRO: "METRO",
     SOLID: "SOLID"
 }
@@ -594,7 +596,7 @@ var TaskbarAppIcon = GObject.registerClass({
                 let backgroundSize = containerWidth + "px " + 
                                      (containerWidth - (pos == DOT_POSITION.BOTTOM ? highlightMargin : 0)) + "px;";
 
-                if (focusedDotStyle == DOT_STYLE.CILIORA || focusedDotStyle == DOT_STYLE.SEGMENTED)
+                if (focusedDotStyle == DOT_STYLE.CILIORA || focusedDotStyle == DOT_STYLE.SEGMENTED || focusedDotStyle == DOT_STYLE.CILIORAROUND)
                     highlightMargin += 1;
 
                 if (this._nWindows > 1 && focusedDotStyle == DOT_STYLE.METRO) {
@@ -821,6 +823,7 @@ var TaskbarAppIcon = GObject.registerClass({
     _isWideDotStyle(dotStyle) {
         return dotStyle == DOT_STYLE.SEGMENTED || 
             dotStyle == DOT_STYLE.CILIORA || 
+            dotStyle == DOT_STYLE.CILIORAROUND ||
             dotStyle == DOT_STYLE.METRO || 
             dotStyle == DOT_STYLE.SOLID;
     }
@@ -1183,6 +1186,7 @@ var TaskbarAppIcon = GObject.registerClass({
         } else {
             let spacing = Math.ceil(areaSize / 18); // separation between the indicators
             let length;
+            let radius;
             let dist;
             let indicatorSize;
             let translate;
@@ -1207,8 +1211,24 @@ var TaskbarAppIcon = GObject.registerClass({
                         cr.rectangle.apply(cr, (isHorizontalDots ? [dist, 0] : [0, dist]).concat([size, size]));
                     };
                     break;
+                case DOT_STYLE.CILIORAROUND:
+                    spacing = size;
+                    radius = size / 2;
+                    length = areaSize - (size * (n - 1)) - (spacing * (n - 1));
+                    translate = () => cr.translate(startX, startY);
+                    preDraw = () => {
+                        cr.newSubPath();
+                        cr.arc.apply(cr, (isHorizontalDots ? [radius, radius] : [radius, radius]).concat([radius, 0, 2 * Math.PI]));
+                        cr.arc.apply(cr, (isHorizontalDots ? [length - radius, radius] : [radius, length - radius]).concat([radius, 0, 2 * Math.PI]));
+                        cr.rectangle.apply(cr, (isHorizontalDots ? [radius, 0, length - size, size] : [0, radius, size, length - size]));
+                    };
+                    draw = i => {
+                        dist = length + (i * spacing) + ((i - 1) * size) + radius;
+                        cr.arc.apply(cr, (isHorizontalDots ? [dist, radius] : [radius, dist]).concat([radius, 0, 2 * Math.PI]));
+                    };
+                    break;
                 case DOT_STYLE.DOTS:
-                    let radius = size / 2;
+                    radius = size / 2;
 
                     translate = () => {
                         indicatorSize = Math.floor((areaSize - n * size - (n - 1) * spacing) / 2);
@@ -1237,6 +1257,20 @@ var TaskbarAppIcon = GObject.registerClass({
                     }
                     draw = i => drawDash(i, length);
                     break;
+                case DOT_STYLE.CAPSULES:
+                    radius = size / 2;
+                    length = Math.floor(areaSize / MAX_INDICATORS) - spacing;
+                    translate = () => {
+                        indicatorSize = Math.floor((areaSize - n * length - (n - 1) * spacing) / 2);
+                        cr.translate.apply(cr, isHorizontalDots ? [indicatorSize, startY] : [startX, indicatorSize]);
+                    }
+                    draw = i => {
+                        dist = i * length + i * spacing;
+                        cr.arc.apply(cr, (isHorizontalDots ? [dist + radius, radius] : [radius, dist + radius]).concat([radius, 0, 2 * Math.PI]));
+                        cr.arc.apply(cr, (isHorizontalDots ? [dist + length - radius, radius] : [radius, dist + length - radius]).concat([radius, 0, 2 * Math.PI]));
+                        cr.rectangle.apply(cr, (isHorizontalDots ? [dist + radius, 0, length - size, size] : [0, dist + radius, size, length - size]));
+                    };
+                    break;
                 case DOT_STYLE.SEGMENTED:
                     length = Math.ceil((areaSize - ((n - 1) * spacing)) / n);
                     translate = () => cr.translate(startX, startY);
@@ -1927,3 +1961,4 @@ var getIconContainerStyle = function(isVertical) {
 
     return style;
 }
+

From 786526b62be1290eb7d3f569d75294833dbd3753 Mon Sep 17 00:00:00 2001
From: snoutie <71790678+SnoutBug@users.noreply.github.com>
Date: Mon, 25 Jul 2022 21:36:53 +0200
Subject: [PATCH 2/2] Add schemas

---
 schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml b/schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml
index 7e8ea3a9..7b4f96a3 100644
--- a/schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml
+++ b/schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml
@@ -8,6 +8,8 @@
     <value value='4' nick='SOLID'/>
     <value value='5' nick='CILIORA'/>
     <value value='6' nick='METRO'/>
+    <value value='7' nick='CAPSULES'/>
+    <value value='8' nick='CILIORAROUND'/>
   </enum>
   <enum id='org.gnome.shell.extensions.dash-to-panel.clickAction'>
     <value value='0' nick='RAISE'/>