Hopefully final unification and cleanup of the SVG data used for drawing indicators

1 files changed, 21 insertions, 19 deletions

diff --git a/unix/tkUnixButton.c b/unix/tkUnixButton.c
index 07bfe0b..5f84e72 100644
--- a/unix/tkUnixButton.c
+++ b/unix/tkUnixButton.c
@@ -84,12 +84,12 @@ static const char checkbtnOffData[] =
     "   <stop stop-color='#000000' offset='0'/>\n"
     "  </linearGradient>\n"
     " </defs>\n"
-    " <rect id='rectbackdrop' x='2' y='2' width='12' height='12' fill='#INTROR' stroke-width='11' style='paint-order:stroke markers fill'/>\n"
-    " <g stroke-width='10.16'>\n"
-    "  <path id='recttopside' d='m0 0h16.002l-1.0025 1h-13.999l-1-1' fill='url(#linearGradientTop)' style='paint-order:stroke markers fill'/>\n"
-    "  <path id='rectleftside' d='m0 0 1 1v14.002l-1 1.0024' fill='url(#linearGradientLeft)' style='paint-order:stroke markers fill'/>\n"
-    "  <path id='rectrightside' d='m16 0-1 1v14.023l1 0.97186v-15.995' fill='url(#linearGradientRight)' style='paint-order:stroke markers fill'/>\n"
-    "  <path id='rectbottomside' d='m0 16 1-1h14l1.0041 1h-16.004' fill='url(#linearGradientBottom)' style='paint-order:stroke markers fill'/>\n"
+    " <g style='paint-order:stroke markers fill'>\n"
+    "  <rect id='rectbackdrop' x='2' y='2' width='12' height='12' fill='#INTROR'/>\n"
+    "  <path id='recttopside' d='m0 0h16l-1 1h-14l-1-1' fill='url(#linearGradientTop)'/>\n"
+    "  <path id='rectleftside' d='m0 0 1 1v14l-1 1' fill='url(#linearGradientLeft)'/>\n"
+    "  <path id='rectrightside' d='m16 0-1 1v14l1 1v-16' fill='url(#linearGradientRight)'/>\n"
+    "  <path id='rectbottomside' d='m0 16 1-1h14l1 1h-16' fill='url(#linearGradientBottom)'/>\n"
     " </g>\n"
     "</svg>";
 
@@ -113,14 +113,14 @@ static const char checkbtnOnData[] =
     "   <stop stop-color='#000000' offset='0'/>\n"
     "  </linearGradient>\n"
     " </defs>\n"
-    " <rect id='rectbackdrop' x='2' y='2' width='12' height='12' fill='#INTROR' stroke-width='11' style='paint-order:stroke markers fill'/>\n"
-    " <g stroke-width='10.16'>\n"
-    "  <path id='recttopside' d='m0 0h16.002l-1.0025 1h-13.999l-1-1' fill='url(#linearGradientTop)' style='paint-order:stroke markers fill'/>\n"
-    "  <path id='rectleftside' d='m0 0 1 1v14.002l-1 1.0024' fill='url(#linearGradientLeft)' style='paint-order:stroke markers fill'/>\n"
-    "  <path id='rectrightside' d='m16 0-1 1v14.023l1 0.97186v-15.995' fill='url(#linearGradientRight)' style='paint-order:stroke markers fill'/>\n"
-    "  <path id='rectbottomside' d='m0 16 1-1h14l1.0041 1h-16.004' fill='url(#linearGradientBottom)' style='paint-order:stroke markers fill'/>\n"
+    " <g style='paint-order:stroke markers fill'>\n"
+    "  <rect id='rectbackdrop' x='2' y='2' width='12' height='12' fill='#INTROR'/>\n"
+    "  <path id='recttopside' d='m0 0h16l-1 1h-14l-1-1' fill='url(#linearGradientTop)'/>\n"
+    "  <path id='rectleftside' d='m0 0 1 1v14l-1 1' fill='url(#linearGradientLeft)'/>\n"
+    "  <path id='rectrightside' d='m16 0-1 1v14l1 1v-16' fill='url(#linearGradientRight)'/>\n"
+    "  <path id='rectbottomside' d='m0 16 1-1h14l1 1h-16' fill='url(#linearGradientBottom)'/>\n"
+    "  <path id='indicator' d='m4.5 8 3 3 4-6' fill='none' stroke='#INDCTR' stroke-linecap='round' stroke-linejoin='round' stroke-width='2'/>\n"
     " </g>\n"
-    " <path id='indicator' d='m4.4194 7.9316 3 3 4-7' fill='none' stroke='#INDCTR' stroke-width='2px' style='paint-order:stroke markers fill'/>\n"
     "</svg>";
 
 static const char radiobtnOffData[] =
@@ -131,8 +131,10 @@ static const char radiobtnOffData[] =
     "   <stop stop-color='#LIGHTT' stop-opacity='0' offset='1'/>\n"
     "  </linearGradient>\n"
     " </defs>\n"
-    " <circle cx='8' cy='8' r='8' fill='url(#gradient1)' fill-rule='evenodd'/>\n"
-    " <circle cx='8' cy='8' r='6.5' fill='#INTROR' fill-rule='evenodd'/>\n"
+    " <g fill-rule='evenodd'>\n"
+    "  <circle cx='8' cy='8' r='8' fill='url(#gradient1)'/>\n"
+    "  <circle cx='8' cy='8' r='6.5' fill='#INTROR'/>\n"
+    " </g>\n"
     "</svg>";
 
 static const char radiobtnOnData[] =
@@ -151,15 +153,15 @@ static const char radiobtnOnData[] =
     "</svg>";
 
 static const char menuOffData[] =
-    "<svg width='8' height='8' version='1.1' viewBox='0 0 8 8' xmlns='http://www.w3.org/2000/svg'></svg>";
+    "<svg width='8' height='8' version='1.1' xmlns='http://www.w3.org/2000/svg'></svg>";
 
 static const char checkmenuOnData[] =
-    "<svg width='8' height='8' version='1.1' viewBox='0 0 8 8' xmlns='http://www.w3.org/2000/svg'>\n"
-    " <path id='indicator' d='m0.59082 3.0963 3.3419 3.3419 3.3419-5.8483' fill='none' stroke='#INDCTR' stroke-width='1.6709px' style='paint-order:stroke markers fill'/>\n"
+    "<svg width='8' height='8' version='1.1' xmlns='http://www.w3.org/2000/svg'>\n"
+    " <path id='indicator' d='m1 3.5 2.5 3 3.5-5' fill='none' stroke='#INDCTR' stroke-linecap='round' stroke-linejoin='round' stroke-width='1.975' style='paint-order:stroke markers fill'/>\n"
     "</svg>";
 
 static const char radiomenuOnData[] =
-    "<svg width='8' height='8' version='1.1' viewBox='0 0 8 8' xmlns='http://www.w3.org/2000/svg'>\n"
+    "<svg width='8' height='8' version='1.1' xmlns='http://www.w3.org/2000/svg'>\n"
     " <circle cx='4' cy='4' r='3' fill='#INDCTR' fill-rule='evenodd'/>\n"
     "</svg>";