commit a8b633b3160f906a67d57c7d62992fe986f43828
parent a68fec192ead8211f9fbf75be9213ed55b2dc350
Author: Adam M <[email protected]>
Date: Tue, 7 Apr 2020 11:08:04 -0500
Boly Puttons panel and iso buttons made less steep
Diffstat:
5 files changed, 113 insertions(+), 71 deletions(-)
diff --git a/res/ComputerscareBolyPuttonsPanel.svg b/res/ComputerscareBolyPuttonsPanel.svg
@@ -26,9 +26,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="2.0000001"
- inkscape:cx="57.012173"
- inkscape:cy="296.11402"
+ inkscape:zoom="11.313709"
+ inkscape:cx="28.17334"
+ inkscape:cy="360.04446"
inkscape:document-units="mm"
inkscape:current-layer="g1669"
showgrid="false"
@@ -292,80 +292,64 @@
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccc" />
<path
- style="fill:none;stroke:#f0f0f0;stroke-width:0.45823276;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 0.65653092,197.27527 c -0.0136473,0.43346 -0.0168363,0.87335 0.15942843,1.29609 0.0250435,0.20907 0.0912968,0.42199 0.17439883,0.61835 0.0740767,0.38032 0.0139221,0.7656 0.0820099,1.14585 -0.0097,0.2362 0.018458,0.47428 -0.044121,0.70862 0.088086,0.21749 -0.12636674,0.43994 -0.02505,0.65565 0.2667008,0.12633 0.6397364,-0.0783 0.9638221,-0.0477 0.4668753,-0.0291 0.9871113,-0.10776 1.2497037,-0.3689 0.2773662,-0.20612 0.6977212,-0.41228 0.6441774,-0.70844 -0.2236735,-0.42332 -0.8971942,-0.68739 -1.5475771,-0.83917 -0.2518322,-0.0788 -0.5128892,-0.15515 -0.8006394,-0.17709 -0.1562923,-0.0166 -0.58901006,-0.0569 -0.2253771,-0.0894 0.7930713,-0.13416 1.5496371,-0.33651 2.3022498,-0.5361 0.3146208,-0.0907 0.5433659,-0.3262 0.3712593,-0.53162 -0.2341884,-0.37789 -0.4745162,-0.76057 -0.8237227,-1.10487 -0.3532772,-0.27518 -0.975027,-0.41494 -1.5339013,-0.33757 -0.3734022,0.0399 -0.4956638,0.38491 -0.90862212,0.31273 l -0.038039,0.003 z"
+ style="fill:none;stroke:#f0f0f0;stroke-width:0.426;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 0.59041651,197.04072 c -0.0137993,0.21756 -0.0170238,0.43835 0.16120379,0.65053 0.0253224,0.10494 0.0923135,0.21181 0.17634089,0.31037 0.0749016,0.19089 0.0140771,0.38427 0.0829231,0.57513 -0.00981,0.11855 0.018664,0.23805 -0.0446123,0.35567 0.0890669,0.10917 -0.12777393,0.22082 -0.0253289,0.32909 0.26967071,0.0634 0.64686031,-0.0393 0.97455501,-0.0239 0.4720743,-0.0146 0.9981035,-0.0541 1.2636201,-0.18516 0.2804549,-0.10346 0.7054909,-0.20694 0.6513508,-0.35559 -0.2261643,-0.21247 -0.9071852,-0.34501 -1.5648106,-0.4212 -0.2546365,-0.0395 -0.5186006,-0.0779 -0.8095551,-0.0889 -0.1580327,-0.008 -0.59556912,-0.0286 -0.2278869,-0.0449 0.8019028,-0.0673 1.5668936,-0.16891 2.3278872,-0.26908 0.3181243,-0.0455 0.5494167,-0.16373 0.3753935,-0.26684 -0.2367962,-0.18967 -0.4798003,-0.38175 -0.8328955,-0.55456 -0.3572112,-0.13812 -0.9858846,-0.20827 -1.5509824,-0.16943 -0.3775604,0.02 -0.5011834,0.19319 -0.91874033,0.15696 l -0.0384626,0.002 z"
id="path1294"
inkscape:connector-curvature="0" />
<path
- style="fill:none;stroke:#f0f0f0;stroke-width:0.66333157;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 5.7843672,199.16241 c -0.4997165,0.008 -0.7234892,0.5894 -0.725154,0.96656 -0.056773,0.43097 -0.015744,1.0865 0.6332436,1.15638 0.5382834,-0.0301 1.0821854,-0.0133 1.6234377,-0.0173 0.3111165,-0.38641 0.4179181,-0.89038 0.2749804,-1.33757 -0.2856993,-0.37239 -0.7693212,-0.62388 -1.2991329,-0.64241 -0.187767,-0.0256 -0.3098008,-0.0617 -0.5073748,-0.12561 z"
+ style="fill:none;stroke:#d6bebe;stroke-width:0.56077296;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 5.7947901,197.47534 c -0.5020097,0.006 -0.7268093,0.4193 -0.7284817,0.68763 -0.057033,0.30659 -0.015816,0.77295 0.6361495,0.82266 0.5407537,-0.0214 1.0871517,-0.01 1.6308879,-0.0128 0.3125442,-0.2749 0.4198359,-0.63344 0.2762423,-0.95157 -0.2870104,-0.26492 -0.7728517,-0.44384 -1.3050948,-0.45702 -0.1886286,-0.0183 -0.3112224,-0.0439 -0.5097032,-0.0894 z"
id="path1302"
inkscape:connector-curvature="0" />
<path
- style="fill:none;stroke:#f0f0f0;stroke-width:0.45823276;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 9.0366027,197.89459 c -0.00842,1.12915 0.016866,2.25923 -0.012694,3.38779 -0.00537,0.0409 -0.018264,0.0811 -0.024888,0.12188"
+ style="fill:none;stroke:#f0f0f0;stroke-width:0.38738474;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 9.0619504,196.57339 c -0.00845,0.80328 0.016944,1.60725 -0.012752,2.41013 -0.00539,0.0291 -0.018347,0.0577 -0.025002,0.0867"
id="path1304"
inkscape:connector-curvature="0" />
<path
id="path1308"
- style="fill:none;stroke:#f0f0f0;stroke-width:0.45823276;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 12.418694,200.61838 c -0.314229,0.20872 -0.670497,0.41215 -1.066851,0.55183 -0.210794,0.091 -0.456502,0.20024 -0.62419,0.22839 m -0.338214,-2.72996 c 0.28554,0.29674 0.635663,0.57287 0.969044,0.8463 0.369625,0.34968 0.749713,0.6846 1.127906,1.02497 0.09437,0.11321 0.02266,-0.19258 0.04504,-0.26641 0,-0.64202 0,-1.28404 0,-1.92605"
+ style="fill:none;stroke:#d6bebe;stroke-width:0.38738474;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 12.459562,198.51113 c -0.315671,0.14849 -0.673573,0.29322 -1.071747,0.39259 -0.211761,0.0648 -0.458596,0.14244 -0.627054,0.16247 m -0.339766,-1.94213 c 0.286851,0.2111 0.63858,0.40755 0.973491,0.60207 0.371321,0.24876 0.753154,0.48704 1.133082,0.72919 0.0948,0.0805 0.02276,-0.13707 0.04524,-0.18954 0,-0.45675 0,-0.91348 0,-1.37022"
inkscape:connector-curvature="0" />
<path
- style="fill:none;stroke:#f0f0f0;stroke-width:0.39147678px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 7.776946,203.84606 c 0.323253,-0.56907 1.099348,-1.31136 1.4913679,-1.3653 0.3960782,-0.0911 0.7180197,0.0728 0.6061989,0.57753 -0.1280772,0.41525 -0.5643414,0.84959 -0.9127385,1.10954 -0.3793257,0.30924 -0.763256,0.62844 -1.1364355,0.84563 m -0.027093,-1.48934 c 0.037836,1.89762 0.2534142,3.65377 0.1784411,5.64081"
+ style="fill:none;stroke:#c6c6c6;stroke-width:0.27282465px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 0.88658006,200.82672 c 0.30965884,-0.33962 1.05311534,-0.83865 1.42864904,-0.92797 0.3794213,-0.10881 0.6878236,-0.0766 0.5807054,0.19698 -0.1226909,0.23078 -0.5406082,0.51995 -0.8743536,0.70683 -0.3633733,0.21675 -0.7311575,0.43927 -1.08864315,0.6084 m -0.0259536,-0.75084 c 0.0362448,0.95613 0.24275705,1.81244 0.17093685,2.83174"
id="path1312"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccc" />
<path
- style="fill:none;stroke:#f0f0f0;stroke-width:0.50315398px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 8.8764927,205.85583 0.069985,1.58718 c -0.087017,0.52743 0.4888062,-0.0202 0.7303814,-0.30606 0.1852255,-0.71506 0.1142458,-1.27784 0.097536,-1.85936 0.061731,-0.37624 0.095122,0.14784 -0.1389978,-0.334"
+ style="fill:none;stroke:#e9e9e9;stroke-width:0.38511753;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 1.8962531,201.96228 0.066395,1.41528 c -0.082553,0.48757 0.4637305,-0.0946 0.6929127,-0.38938 0.1757235,-0.67154 0.108385,-1.16613 0.092532,-1.68608 0.058565,-0.34776 0.090242,0.11796 -0.1318672,-0.27837"
id="path1314"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
id="path1318"
- style="fill:none;stroke:#f0f0f0;stroke-width:0.44958332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 10.296923,204.75883 c 0.318991,-0.37082 0.639727,-0.71319 0.957557,-1.10383 l 0.324682,-1.0784 m -1.044542,-0.37303 c 0.291568,1.01786 0.612324,2.04509 0.640702,3.52917 0.111758,0.17335 0.128708,0.58839 0.210882,0.80961"
+ style="fill:none;stroke:#e9e9e9;stroke-width:0.37448928px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 3.2949373,202.37653 c 0.3198142,-0.30941 0.6413779,-0.59942 0.9600282,-0.92233 l 0.3255199,-0.80004 m -1.0472377,-0.0854 c 0.2923205,0.65617 0.6139043,1.314 0.6423555,2.33637 0.1120464,0.10148 0.1290402,0.38591 0.2114262,0.52539"
inkscape:connector-curvature="0" />
<path
id="path1322"
- style="fill:none;stroke:#f0f0f0;stroke-width:0.38891584px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 12.061073,203.48467 c 0.292525,-0.22686 1.267897,-1.45704 1.368485,-1.4838 m -0.685532,-0.5337 c 0.01616,1.51894 0.03233,3.03786 0.04847,4.55685"
+ style="fill:none;stroke:#f0f0f0;stroke-width:0.43104818px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 5.2197979,201.32315 c 0.5203786,-0.24253 2.2554872,-1.37834 2.4344258,-1.42635 m -1.219507,-0.16727 c 0.028747,1.04414 0.057512,2.08825 0.086224,3.13243"
inkscape:connector-curvature="0" />
<path
- style="fill:none;stroke:#282828;stroke-width:0.46782875;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 14.514623,202.26947 c -0.240165,0.13682 -0.403128,0.57731 -0.337357,1.17151 -0.0073,0.77749 0.06027,2.06295 0.488448,1.28546 0.304568,-0.80527 0.317171,-2.17378 0.04527,-2.40895 -0.0717,-0.22655 -0.193339,-0.0652 -0.316092,0.0905"
+ style="fill:none;stroke:#d6bebe;stroke-width:0.56605119;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 8.203529,200.53945 c -0.5222033,0.17828 -0.8765422,0.53336 -0.7335328,0.90983 -0.015873,0.5261 0.1310481,1.36735 1.0620578,0.69023 0.662238,-0.65146 0.6896413,-1.5774 0.098432,-1.63818 -0.155901,-0.12681 -0.420387,0.0255 -0.6872953,0.17432"
id="path1324"
inkscape:connector-curvature="0" />
<path
- style="fill:none;stroke:#282828;stroke-width:0.36399999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 14.033208,205.3727 c -0.05426,0.3258 -0.174332,1.6171 -0.154102,1.67281 0.09452,-0.47357 0.155284,-0.55608 0.557997,-1.06103 0.449293,-0.41993 0.594347,0.0635 0.591615,0.38459 0.0094,0.2531 -0.0056,1.04199 0.0027,1.29041"
+ style="fill:none;stroke:#d6bebe;stroke-width:0.28714368;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 10.141235,199.43589 c -0.02957,0.37692 -0.095,1.86224 -0.08398,1.92405 0.05151,-0.54929 0.08462,-0.64896 0.304089,-1.26179 0.244849,-0.51991 0.323898,0.019 0.32241,0.38597 0.0051,0.28818 -0.003,1.19034 0.0015,1.47328"
id="path1326"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
- style="fill:none;stroke:#282828;stroke-width:0.35277778;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 15.713332,207.97809 c -0.403474,-0.008 -0.973881,0.11908 -1.339085,0.69561 -0.411739,0.5041 0.276888,0.3953 0.40465,0.60115 0.633791,-0.32012 -0.134122,0.43012 -0.417057,0.3759 -0.216369,-0.0314 -0.691672,0.32763 -0.700459,0.35109"
+ style="fill:none;stroke:#e9e9e9;stroke-width:0.32719675;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 13.259879,199.19313 c -0.399392,0.0589 -0.964028,0.26258 -1.325536,0.82325 -0.407573,0.50534 0.274086,0.29829 0.400556,0.45631 0.627378,-0.38172 -0.132766,0.3957 -0.412838,0.39479 -0.214179,0.008 -0.684673,0.39772 -0.693372,0.41953"
id="path1328"
inkscape:connector-curvature="0" />
<path
- style="fill:none;stroke:#000000;stroke-width:0.45270872;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 8.0221419,220.95097 c 0.00891,-0.79012 -0.019784,-1.58079 0.018039,-2.37046 0.013335,-0.17356 0.2738471,-0.24361 0.2265385,-0.42392 0.028356,-0.12107 0.2129311,-0.30155 0.3018227,-0.13086 0.064441,0.12905 0.074033,0.27938 0.1495606,0.40476 0.1345307,0.27348 0.3530543,0.51644 0.397818,0.82646 0.041217,0.44405 0.2240905,0.87605 0.1610574,1.32745 -0.014926,0.22073 -0.02983,0.45295 0.0538,0.66274"
- id="path3287"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#000000;stroke-width:0.45270872;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 8.0790386,219.64971 c 0.4183883,0.004 0.8368749,-0.008 1.2551922,0.004 -0.2143487,0.0147 -0.4310582,-0.0421 -0.6434568,0.006 -0.1063373,0.0922 0.1518608,0.0377 0.2057444,0.0491 0.087833,-0.002 0.1757516,-0.004 0.2635645,-1.2e-4"
- id="path3289"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#000000;stroke-width:0.522;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 12.579934,221.13044 c 0.2306,-0.0871 0.377788,-0.24957 0.345335,-0.37983 0.01466,-0.30599 -0.0054,-0.61261 0.02604,-0.91815 0.01018,-0.55332 -0.02037,-1.10683 -0.08183,-1.65834 0.08112,-0.17305 0.392073,-0.19881 0.584867,-0.11119 0.276331,0.0925 0.517163,0.23375 0.739697,0.38204 0.240434,0.20795 0.404982,0.50761 0.260066,0.7738 -0.10719,0.16005 -0.368608,0.22149 -0.595352,0.23446 -0.145112,-0.006 -0.373121,-0.0484 -0.443947,-0.10997 0.210394,0.0395 0.419856,0.0921 0.627463,0.14287 0.402912,0.1081 0.824863,0.32423 0.884388,0.65621 0.04904,0.22622 -0.05558,0.50138 -0.369509,0.59749 -0.408231,0.13621 -0.866963,0.0521 -1.295461,0.10395 -0.152172,0.0209 -0.292932,0.0764 -0.403287,0.155"
- id="path3291"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccccccccccccc" />
- <path
style="fill:none;stroke:#000000;stroke-width:0.065;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 14.940697,247.23471 0.06331,1.30962 -0.333252,0.52619 1.214871,0.52819 v 0 0 0"
id="path956"
@@ -377,5 +361,57 @@
id="path958"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#f9f9f9;stroke:#000000;stroke-width:0.27782598px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1"
+ d="M 2.0669046,219.40473 1.9877055,222.26759 6.81889,222.14577 6.7396944,219.222 Z"
+ id="path990"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.27826348;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 6.7396902,219.222 1.7423953,1.00503 -0.079196,2.19283 -1.6631959,-0.30456 z"
+ id="path992"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:#7c7c7c;stroke:#000000;stroke-width:0.27826348;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill-opacity:1"
+ d="m 2.0669046,222.29804 c 0.395999,0.0608 1.9007945,0.51775 1.9007945,0.51775 l 4.5143864,-0.30455 -1.6631958,-0.42639 z"
+ id="path994"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path2706"
+ d="m 10.719088,219.28375 -0.08351,3.28201 4.842857,-0.13965 0.04174,-2.44405 -0.79772,-0.85642 z"
+ style="fill:#3d3d3d;fill-opacity:1;stroke:#000000;stroke-width:0.30543426px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+ sodipodi:nodetypes="cccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path2708"
+ d="m 11.541476,222.63492 -1.255515,-0.0292 -0.0011,-3.49115 1.070465,0.71052 z"
+ style="fill:#9b9b9b;fill-opacity:1;stroke:#000000;stroke-width:0.2246304;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:none;stroke:#ececec;stroke-width:0.30268985;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 12.262684,222.15653 c 0.235882,-0.0558 0.386442,-0.15998 0.353245,-0.24351 0.01513,-0.19615 -0.0057,-0.39272 0.02666,-0.58861 0.01064,-0.35471 -0.02083,-0.70956 -0.0837,-1.0631 0.08298,-0.11098 0.496742,0.17237 0.693949,0.22854 0.282664,0.0593 0.433325,-0.14999 0.660955,-0.0549 0.245942,0.13329 0.414257,0.32541 0.266024,0.49605 -0.10965,0.10264 -0.377053,0.14201 -0.60899,0.15031 -0.148433,-0.004 -0.30393,0.17208 -0.376379,0.13254 0.215212,0.0254 0.351737,-0.14395 0.5641,-0.11146 0.412142,0.0692 0.50885,0.11785 0.569738,0.33072 0.05018,0.14501 0.278053,0.41139 -0.04309,0.47299 -0.41758,0.0873 -0.886822,0.0334 -1.325138,0.0666 -0.155637,0.0134 -0.299639,0.049 -0.412522,0.0993"
+ id="path3291"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path2710"
+ d="m 15.508758,219.89523 0.03489,-0.80738 -5.157516,0.0319 c 0.04771,0.18842 0.729417,0.46174 1.110199,0.69476 z"
+ style="fill:#787878;fill-opacity:1;stroke:#000000;stroke-width:0.2729378;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ sodipodi:nodetypes="ccccc" />
+ <g
+ id="g2726">
+ <path
+ inkscape:connector-curvature="0"
+ id="path3289"
+ d="m 3.4712564,220.75188 c 0.708461,0.003 1.4170884,-0.005 2.1254291,0.003 -0.3629586,0.01 -0.729915,-0.0275 -1.0895716,0.004 -0.180062,0.0601 0.2571473,0.0245 0.3483889,0.0319 0.1487286,-0.002 0.2976019,-0.003 0.4462964,-8e-5"
+ style="fill:none;stroke:#000000;stroke-width:0.47536719;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path3287"
+ d="m 3.3749126,221.5992 c 0.015088,-0.51449 -0.0335,-1.02934 0.030545,-1.54354 0.02258,-0.11301 0.4637079,-0.15863 0.3835998,-0.27603 0.048015,-0.0788 0.3605583,-0.19637 0.5110793,-0.0852 0.1091186,0.084 0.1253609,0.18192 0.2532524,0.26357 0.2278022,0.17807 0.5978303,0.33628 0.6736291,0.53815 0.069793,0.28915 0.3794546,0.57044 0.2727201,0.86437 -0.025275,0.14373 -0.050512,0.29494 0.0911,0.43155"
+ style="fill:none;stroke:#000000;stroke-width:0.47536719;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
</g>
</svg>
diff --git a/res/computerscare-channels-empty-knob-auto-mode.svg b/res/computerscare-channels-empty-knob-auto-mode.svg
@@ -40,9 +40,9 @@
inkscape:window-height="834"
id="namedview1287"
showgrid="false"
- inkscape:zoom="44.756014"
- inkscape:cx="10.167848"
- inkscape:cy="12.585836"
+ inkscape:zoom="22.378007"
+ inkscape:cx="9.7209807"
+ inkscape:cy="7.2234282"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="0"
@@ -108,8 +108,8 @@
d="m 4.5808552,43.048284 c -0.916995,0.776532 -1.6722965,1.803125 -1.9013601,3.031798 -0.5431233,2.168432 -0.4358872,4.429132 -0.5395994,6.645897 0.036253,1.148227 0.7926187,2.062573 1.410674,2.938392 0.7968887,0.857174 2.0119906,0.865255 3.0251773,1.270916 1.136957,-0.01439 2.0164644,0.595913 2.750354,0.670576 1.570628,-0.13174 1.855081,0.101175 3.049879,0.287472 1.151066,0.157815 1.854001,0.671787 2.426802,-0.144803 0.448227,-0.952378 0.917889,-1.929294 0.971381,-3.009072 0.06756,-0.932379 0.610671,-1.738462 0.626678,-2.683326 0.05254,-1.041607 0.08676,-2.098552 -0.02634,-3.134093 -0.119858,-1.021423 -0.668707,-1.886466 -0.817907,-2.88858 -0.386676,-0.862701 -0.6563,-1.904954 -1.530782,-2.37809 -0.789007,-0.637386 -1.719449,-1.034032 -2.735757,-0.896557 -1.223655,-0.191187 -2.4577279,-0.05624 -3.6867338,-0.01441 -1.0038807,0.03353 -2.0628646,0.04852 -3.0224776,0.303872 z"
style="fill:#ffffff;stroke:#f2f2f2;stroke-width:0.48204279;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill-opacity:1" />
<path
- style="fill:none;stroke:#5b5b5b;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 4.2899263,43.063729 c -0.9705151,0.789392 -1.7698995,1.832986 -2.0123323,3.082008 -0.5748226,2.204344 -0.4613277,4.502483 -0.5710931,6.75596 0.03837,1.167243 0.8388798,2.096731 1.4930076,2.987054 0.8433989,0.87137 2.1294198,0.879586 3.2017409,1.291965 1.2033151,-0.01462 1.9856308,-0.335365 2.7289111,0.382967 1.1941025,0.476388 2.1453185,0.401565 3.4098495,0.590947 1.218249,0.160429 1.899013,-0.138643 2.505246,-0.968757 0.474388,-0.96815 1.034658,-1.139689 1.091272,-2.23735 0.07151,-0.947819 0.646313,-1.767252 0.663254,-2.727765 0.05561,-1.058857 0.09182,-2.133305 -0.02787,-3.185996 -0.126854,-1.038339 -0.707737,-1.917709 -0.865645,-2.936419 -0.409243,-0.876986 -0.694604,-1.936501 -1.620124,-2.417472 -0.835058,-0.647942 -1.819806,-1.051157 -2.895429,-0.911406 -1.295073,-0.194353 -2.6011726,-0.05717 -3.9019091,-0.01464 -1.0624719,0.03408 -2.183263,0.04933 -3.1988836,0.308904 z"
+ style="fill:none;stroke:#d58bed;stroke-width:1.77900457;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 4.2830031,43.445647 c -0.9718619,0.770016 -1.7723556,1.787994 -2.0151248,3.006358 -0.5756203,2.150237 -0.4619679,4.391966 -0.5718856,6.59013 0.038423,1.138592 0.8400439,2.045265 1.4950794,2.913734 0.8445693,0.849982 2.1323748,0.857996 3.206184,1.260253 1.2049849,-0.01426 1.9883862,-0.327133 2.7326979,0.373567 1.19576,0.464695 2.148296,0.391708 3.414581,0.576442 1.21994,0.156491 1.901649,-0.13524 2.508723,-0.944978 0.475046,-0.944386 1.036094,-1.111715 1.092786,-2.182433 0.07161,-0.924554 0.64721,-1.723873 0.664175,-2.66081 0.05569,-1.032866 0.09195,-2.080941 -0.02791,-3.107793 -0.12703,-1.012852 -0.708719,-1.870638 -0.866846,-2.864343 -0.409811,-0.855459 -0.695568,-1.888968 -1.622373,-2.358133 -0.836216,-0.632038 -1.822331,-1.025355 -2.899447,-0.889035 -1.29687,-0.189582 -2.6047817,-0.05577 -3.9073233,-0.01428 -1.0639462,0.03324 -2.1862926,0.04812 -3.2033226,0.301321 z"
id="path1618"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccccccccccccc" />
@@ -136,13 +136,14 @@
<path
inkscape:connector-curvature="0"
id="path1612"
- d="m 7.912063,43.332592 c -0.332798,0 -0.665596,0 -0.9983941,0 -0.095085,0 -0.1909044,0.0085 -0.2852554,0 -0.097255,-0.0086 -0.1876463,-0.05738 -0.2852553,-0.05103 -0.6413871,0.04172 -0.3164345,0.06841 -0.6418248,0.153087 -0.2119368,0.05515 -0.4401187,0.08092 -0.6418247,0.153086 -0.047543,0.01713 -0.028792,0.07925 -0.071314,0.10205 -0.9212957,0.494424 -0.184246,0.01197 -0.7131386,0.306171 -0.1465512,0.08156 -0.273405,0.18145 -0.4278832,0.255142 -0.062546,0.02983 -0.1607874,0.01304 -0.2139416,0.05102 -0.075171,0.0538 -0.095085,0.136077 -0.1426285,0.204115 -0.095085,0.05103 -0.1901704,0.102037 -0.2852555,0.153087"
- style="fill:none;stroke:#ee2b2b;stroke-width:1.34994042px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ d="M 8.1398223,46.118417 7.0699483,44.522679 C 6.9716387,44.376048 6.5840937,44.314027 6.0748176,44.928569 5.918363,44.825061 5.7729512,43.995894 5.6159279,43.915216 4.5841294,43.384998 5.1068801,44.397644 4.5834254,44.226528 4.242483,44.115087 3.875407,43.943292 3.550923,43.867538 3.47444,43.849908 3.504604,43.962978 3.4362015,43.958728 1.9541148,43.866758 3.1398053,43.806506 2.2889767,43.769567 2.05322,43.759357 1.8491505,43.795787 1.6006418,43.766267 1.5000231,43.754207 1.3419833,43.637334 1.2564742,43.646613 c -0.1209268,0.01317 -0.152962,0.121584 -0.2294462,0.182376 -0.152962,-0.0095 -0.30592675,-0.01902 -0.4588902,-0.02847"
+ style="fill:none;stroke:#ee2b2b;stroke-width:2.12558532px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.4848485"
+ sodipodi:nodetypes="cscccccccccc" />
<path
inkscape:connector-curvature="0"
id="path1614"
- d="m 11.071698,43.344096 c 0.09437,-0.01358 0.18645,-0.03472 0.283138,-0.04093 0.11725,-0.0076 0.235952,0 0.353928,0 0.18876,0 0.377521,0 0.566281,0 0.117979,0 0.235951,0 0.353927,0 0.09438,0 0.19477,-0.01915 0.283141,0 0.0098,0.0022 0.542513,0.23731 0.566281,0.245557 0.02023,0.0071 0.05055,-0.0071 0.07079,0 0.101156,0.03509 0.18498,0.08494 0.283141,0.122782 0.04389,0.01684 0.09937,0.02261 0.141565,0.04093 0.05338,0.02315 0.08818,0.05869 0.141565,0.08185 0.04222,0.0183 0.09937,0.02261 0.141565,0.04093 0.0534,0.02315 0.09437,0.05457 0.141565,0.08185 0.04719,0.02728 0.09437,0.05455 0.141565,0.08185"
- style="fill:none;stroke:#ee2b2b;stroke-width:1.20445549px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ d="m 8.5932002,43.538116 c 0.2278625,-0.02099 0.4501932,-0.05368 0.6836509,-0.0633 0.2831033,-0.01175 0.569717,0 0.8545759,0 0.455767,0 0.911539,0 1.367309,0 0.284865,0 0.569714,0 0.854573,0 0.227887,0 0.47028,-0.02961 0.683656,0 0.02359,0.0034 1.309922,0.366972 1.367311,0.379725 0.04885,0.01093 0.122047,-0.01093 0.170919,0 0.244248,0.05426 0.446643,0.131348 0.683656,0.189867 0.105969,0.02603 0.239936,0.03496 0.341815,0.0633 0.128901,0.03578 0.212924,0.09076 0.341816,0.126568 0.101926,0.0283 0.239936,0.03496 0.341814,0.06329 0.128954,0.0358 0.227864,0.08439 0.341817,0.126568 0.113928,0.04219 0.227862,0.08437 0.341812,0.126569"
+ style="fill:none;stroke:#ee2b2b;stroke-width:2.32737398px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.4848485" />
<path
style="fill:none;fill-opacity:1;stroke:#510101;stroke-width:1.21000004;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 8.1139646,42.9247 c -0.9389905,1.5421 0.7095944,3.243621 1.3407824,3.058726 0.790221,-0.007 -0.012404,-3.549349 1.225147,-3.009979"
@@ -165,21 +166,21 @@
<path
inkscape:connector-curvature="0"
id="path1178"
- d="m 16.833858,48.514084 c 0.02859,0.05435 0.06472,0.10537 0.08576,0.163072 0.0255,0.06997 0.0353,0.144711 0.05294,0.217074 0.02824,0.115765 0.05647,0.231543 0.0847,0.347315 0.01765,0.07236 0.0353,0.14471 0.05294,0.217072 0.01412,0.05789 0.04946,0.114498 0.04235,0.173662 -7.39e-4,0.0065 -0.170596,0.394129 -0.175788,0.410838 -0.0044,0.01424 0.01504,0.02918 0.01058,0.04342 -0.02209,0.07112 -0.06244,0.13543 -0.08789,0.205425 -0.01139,0.0313 -0.0091,0.06679 -0.02224,0.09742 -0.01657,0.03873 -0.04907,0.06928 -0.06565,0.107998 -0.01309,0.03064 -0.0091,0.06679 -0.02224,0.09742 -0.01657,0.03874 -0.04374,0.07203 -0.06565,0.107999 -0.02191,0.03599 -0.04374,0.07203 -0.06565,0.107998"
- style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ d="m 16.354355,54.246746 c 0.03929,0.108947 0.08892,0.211219 0.117829,0.326885 0.03504,0.140258 0.04851,0.290078 0.07274,0.435133 0.0388,0.232056 0.07759,0.464137 0.116371,0.696207 0.02425,0.145048 0.04849,0.290077 0.07274,0.435129 0.0194,0.116043 0.06796,0.229516 0.05819,0.348113 -10e-4,0.01303 -0.234394,0.790047 -0.241528,0.823541 -0.0061,0.02854 0.02067,0.05849 0.01453,0.08704 -0.03035,0.142562 -0.08579,0.271474 -0.120758,0.411782 -0.01565,0.06274 -0.01256,0.133883 -0.03055,0.195283 -0.02276,0.07764 -0.06742,0.138874 -0.0902,0.216485 -0.01798,0.06142 -0.01256,0.133883 -0.03055,0.195283 -0.02277,0.07766 -0.0601,0.144387 -0.09021,0.216488 -0.03011,0.07214 -0.0601,0.144387 -0.0902,0.216486"
+ style="fill:none;stroke:#000000;stroke-width:1.65957522px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
- style="fill:none;stroke:#ee2b2b;stroke-width:1.20445549px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 14.786906,46.038035 c 0.08294,0.04702 0.168693,0.08667 0.248954,0.140942 0.09737,0.06576 0.186586,0.144425 0.27988,0.216638 0.149268,0.115539 0.298537,0.23108 0.447805,0.346619 0.0933,0.07221 0.186586,0.144425 0.279879,0.216638 0.07463,0.05777 0.165742,0.104075 0.223903,0.17331 0.0064,0.0077 0.283753,0.519731 0.2975,0.540801 0.01165,0.018 0.04432,0.02533 0.05598,0.04333 0.05851,0.08967 0.09429,0.180395 0.148748,0.270404 0.0244,0.04018 0.06474,0.0787 0.08689,0.119018 0.02804,0.05098 0.03381,0.100386 0.06185,0.151377 0.02219,0.04031 0.06474,0.0787 0.08689,0.119019 0.02806,0.05099 0.04122,0.100916 0.06185,0.151377 0.02062,0.05046 0.04124,0.100901 0.06185,0.151377"
+ style="fill:none;stroke:#ee2b2b;stroke-width:1.63409412px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.4848485"
+ d="m 13.873137,47.596219 c 0.115527,0.06213 0.234967,0.114533 0.34676,0.186253 0.135616,0.0869 0.25989,0.190856 0.389836,0.286284 0.207909,0.152684 0.415822,0.30537 0.623733,0.458053 0.129953,0.09542 0.259889,0.190857 0.389833,0.286285 0.103954,0.07634 0.230856,0.137534 0.311867,0.229027 0.0089,0.01017 0.39523,0.686818 0.414377,0.714663 0.01623,0.02379 0.06173,0.03347 0.07797,0.05726 0.0815,0.118498 0.131328,0.23839 0.207185,0.357335 0.03399,0.0531 0.09017,0.104002 0.12103,0.157282 0.03905,0.06737 0.0471,0.132659 0.08615,0.200042 0.0309,0.05327 0.09017,0.104001 0.121028,0.157282 0.03908,0.06738 0.05741,0.13336 0.08615,0.200044 0.02872,0.06668 0.05744,0.133339 0.08615,0.200042"
id="path1180"
inkscape:connector-curvature="0" />
<path
inkscape:connector-curvature="0"
id="path1182"
- d="m 1.7946273,50.161561 c 0.020712,0.207506 0.041424,0.415014 0.062135,0.62252 0.00592,0.05929 0.019248,0.1183 0.017754,0.177863 -0.00152,0.06139 -0.03832,0.121995 -0.026721,0.182299 0.076277,0.396289 0.079317,0.191352 0.1733416,0.386876 0.061242,0.127352 0.097901,0.267386 0.1733425,0.386878 0.017791,0.02817 0.070839,0.01106 0.093363,0.03559 0.4881739,0.531445 0.021763,0.113852 0.3111777,0.418028 0.080187,0.08429 0.1751307,0.154692 0.2489582,0.244603 0.0299,0.03641 0.021337,0.09913 0.057784,0.128959 0.051547,0.04219 0.1244941,0.04745 0.1867402,0.07118 0.050384,0.05485 0.1007637,0.109699 0.1511519,0.164549"
- style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ d="m 1.8391575,53.274986 c 0.04522,0.433442 0.090438,0.866888 0.1356558,1.30033 0.012913,0.123846 0.042024,0.247107 0.03876,0.371522 -0.00334,0.128235 -0.083663,0.254826 -0.058339,0.38079 0.1665303,0.827775 0.1731675,0.3997 0.378446,0.808113 0.1337062,0.266014 0.2137422,0.558519 0.378448,0.808117 0.038844,0.05884 0.1546593,0.0231 0.203833,0.07435 1.0658,1.11009 0.047516,0.237814 0.6793751,0.873182 0.175068,0.176067 0.3823522,0.323124 0.5435353,0.51093 0.065281,0.07605 0.046584,0.207064 0.126157,0.269372 0.1125388,0.08813 0.2718007,0.09912 0.4076987,0.148681 0.1099995,0.114561 0.2199907,0.229141 0.3300004,0.343715"
+ style="fill:none;stroke:#000000;stroke-width:2.13550544px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60101008" />
<path
- style="fill:none;stroke:#ee2b2b;stroke-width:1.34994042px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 3.4010994,46.460334 c -0.195623,0.269233 -0.391246,0.538465 -0.586869,0.807698 -0.055892,0.07692 -0.1053396,0.159438 -0.1676769,0.230771 -0.064125,0.07362 -0.1567211,0.118076 -0.2089598,0.200774 -0.3432643,0.543404 -0.1306609,0.296207 -0.2534261,0.609221 -0.079963,0.203874 -0.1932434,0.403621 -0.2534268,0.60922 -0.014088,0.04853 0.047189,0.06988 0.040639,0.117679 -0.1415621,1.035954 -0.098619,0.156091 -0.1715008,0.756898 -0.020163,0.166502 -0.013918,0.327843 -0.045106,0.496132 -0.012633,0.06813 -0.083964,0.137742 -0.084483,0.203069 -6.625e-4,0.09244 0.054194,0.156911 0.08129,0.235367 -0.014609,0.10692 -0.029237,0.213826 -0.04383,0.320757"
+ style="fill:none;stroke:#ee2b2b;stroke-width:1.57480478px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.4848485"
+ d="m 3.3128487,45.818427 c -0.2272495,0.315405 -0.454499,0.630811 -0.6817484,0.946217 -0.064928,0.09011 -0.12237,0.18678 -0.1947853,0.270347 -0.074491,0.08625 -0.1820582,0.138326 -0.2427424,0.235206 -0.3987598,0.636596 -0.1517849,0.347006 -0.2943976,0.713701 -0.092891,0.238838 -0.224485,0.472841 -0.2943983,0.713699 -0.016366,0.05685 0.054818,0.08187 0.047209,0.137861 -0.1644485,1.213617 -0.1145634,0.18286 -0.1992274,0.886704 -0.023423,0.195057 -0.016167,0.384068 -0.052399,0.581217 -0.014675,0.07981 -0.097539,0.161364 -0.098142,0.237895 -7.695e-4,0.108293 0.062956,0.183821 0.094433,0.275732 -0.016971,0.125256 -0.033964,0.250496 -0.050917,0.375766"
id="path1184"
inkscape:connector-curvature="0" />
</g>
diff --git a/res/computerscare-iso-button-small-up.svg b/res/computerscare-iso-button-small-up.svg
@@ -34,8 +34,8 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="15.839192"
- inkscape:cx="13.403534"
- inkscape:cy="14.883048"
+ inkscape:cx="24.833641"
+ inkscape:cy="16.689163"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="false"
@@ -53,7 +53,7 @@
<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>
@@ -63,20 +63,20 @@
id="layer1"
transform="translate(0,-289)">
<path
- style="fill:#1c9d82;fill-opacity:1;stroke:#000000;stroke-width:0.17387959px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 0.1307407,294.56797 2.1755974,2.19667 5.5122493,0.0231 -0.1130007,-5.48396 -1.1000464,-1.50854 c -0.1527317,-0.31367 -0.4027278,-0.47378 -0.6621422,-0.52332"
+ style="fill:#1c9d82;fill-opacity:1;stroke:#000000;stroke-width:0.18299402;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 0.13498472,296.1192 2.17320148,0.63818 5.5061789,0.0256 -0.1796201,-5.60982 c -0.4937595,-0.16251 -1.0888666,-0.94602 -1.760248,-0.93658"
id="path1553"
inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccccc" />
+ sodipodi:nodetypes="ccccc" />
<path
- style="fill:#009b00;fill-opacity:1;stroke:#000000;stroke-width:0.17387959px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 5.9272683,294.51692 c 0.1686854,0.34831 0.5378894,0.77919 0.7387193,0.9511 l 1.1191912,1.30294"
+ style="fill:#009b00;fill-opacity:1;stroke:#000000;stroke-width:0.18299402;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 5.9251288,296.04418 c 0.368731,0.18222 0.4538673,0.15991 0.6544761,0.35027 l 1.2013884,0.36992"
id="path1555"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccc" />
<path
- style="fill:#24c9a6;fill-opacity:1;stroke:#000000;stroke-width:0.17387959px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 5.906942,289.27751 c -5.72515839,-0.0463 -5.7564434,-0.0616 -5.7564434,-0.0616 v 0 5.34668 l 5.8190135,0.0154 z"
+ style="fill:#24c9a6;fill-opacity:1;stroke:#000000;stroke-width:0.18299402;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 5.9048249,290.2249 c -5.71885349,-0.0513 -5.75010404,-0.0682 -5.75010404,-0.0682 v 0 5.92022 l 5.81260524,0.0171 z"
id="path1551"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cscccc" />
diff --git a/src/ComputerscareBolyPuttons.cpp b/src/ComputerscareBolyPuttons.cpp
@@ -195,10 +195,14 @@ struct ComputerscareBolyPuttonsWidget : ModuleWidget {
float xx;
float yy;
+ float dx;
+ float dy;
for (int i = 0; i < numToggles; i++) {
xx = 5.2f + 27.3 * (i - i % 8) / 8;
yy = 92 + 33.5 * (i % 8) + 14.3 * (i - i % 8) / 8;
- addLabeledButton(std::to_string(i + 1), xx, yy, module, i, (i - i % 8) * 1.2 - 2, 2);
+ dx = 4 - (i-i%8)*0.9;
+ dy = 19;
+ addLabeledButton(std::to_string(i + 1), xx, yy, module, i, dx, dy);
}
addInput(createInput<InPort>(Vec(9, 58), module, ComputerscareBolyPuttons::A_INPUT));
@@ -209,6 +213,8 @@ struct ComputerscareBolyPuttonsWidget : ModuleWidget {
}
void addLabeledButton(std::string label, int x, int y, ComputerscareBolyPuttons *module, int index, float labelDx, float labelDy) {
+ addParam(createParam<SmallIsoButton>(Vec(x, y), module, ComputerscareBolyPuttons::TOGGLE + index));
+
smallLetterDisplay = new SmallLetterDisplay();
smallLetterDisplay->box.size = Vec(5, 10);
smallLetterDisplay->fontSize = 16;
@@ -217,7 +223,6 @@ struct ComputerscareBolyPuttonsWidget : ModuleWidget {
smallLetterDisplay->box.pos = Vec(x + labelDx, y - 12 + labelDy);
addChild(smallLetterDisplay);
- addParam(createParam<SmallIsoButton>(Vec(x, y), module, ComputerscareBolyPuttons::TOGGLE + index));
}
void fromJson(json_t *rootJ) override
diff --git a/src/ComputerscareKnolyPobs.cpp b/src/ComputerscareKnolyPobs.cpp
@@ -57,7 +57,7 @@ struct DisableableSmoothKnob : RoundKnob {
int channel = 0;
bool disabled = false;
- ComputerscareKnolyPobs *module;
+ ComputerscarePolyModule *module;
DisableableSmoothKnob() {
setSvg(enabledSvg);
