Merge pull request #1635 from safing/fix/tauri-bugs

Fix/tauri bugs

assets/data/icons/generate_ico.sh

@@ -1,14 +1,14 @@
 #!/bin/sh
 
-# Traymenu icons. Sometimes to wrong size is selected so remove 256 and 64.
-convert pm_dark_green_512.png -colors 256 -define icon:auto-resize=48,32,16 pm_dark_green.ico
-convert pm_dark_blue_512.png -colors 256 -define icon:auto-resize=48,32,16 pm_dark_blue.ico
-convert pm_dark_red_512.png -colors 256 -define icon:auto-resize=48,32,16 pm_dark_red.ico
-convert pm_dark_yellow_512.png -colors 256 -define icon:auto-resize=48,32,16 pm_dark_yellow.ico
-convert pm_light_blue_512.png -colors 256 -define icon:auto-resize=48,32,16 pm_light_blue.ico
-convert pm_light_green_512.png -colors 256 -define icon:auto-resize=48,32,16 pm_light_green.ico
-convert pm_light_red_512.png -colors 256 -define icon:auto-resize=48,32,16 pm_light_red.ico
-convert pm_light_yellow_512.png -colors 256 -define icon:auto-resize=48,32,16 pm_light_yellow.ico
+# Traymenu icons. Sometimes the wrong size is selected, so leave just one.
+convert pm_dark_green_512.png -resize 64x64 pm_dark_green_64.png
+convert pm_dark_blue_512.png -resize 64x64 pm_dark_blue_64.png
+convert pm_dark_red_512.png -resize 64x64 pm_dark_red_64.png
+convert pm_dark_yellow_512.png -resize 64x64 pm_dark_yellow_64.png
+convert pm_light_blue_512.png -resize 64x64 pm_light_blue_64.png
+convert pm_light_green_512.png -resize 64x64 pm_light_green_64.png
+convert pm_light_red_512.png -resize 64x64 pm_light_red_64.png
+convert pm_light_yellow_512.png -resize 64x64 pm_light_yellow_64.png
 
 convert pm_dark_512.png -colors 256 -define icon:auto-resize=64,48,32,16 pm_dark.ico
 convert pm_light_512.png -colors 256 -define icon:auto-resize=64,48,32,16 pm_light.ico

desktop/angular/projects/tauri-builtin/src/app/app.component.html

@@ -1,7 +1,7 @@
 <div class="flex flex-row items-center justify-start text-white w-full gap-2 p-2">
   <!-- Logo -->
   <div class="relative w-24 h-20 flex-grow-0 flex-shrink-0 block" id="logo">
-    <svg stroke="currentColor" data-name="Layer-1" viewBox="0 0 128 128" class="animate-spin">
+    <svg stroke="currentColor" data-name="Layer-1" viewBox="0 0 128 128">
       <g data-name="Main" fill-rule="evenodd">
         <path shape-rendering="geometricPrecision" fill="#fff"
           d="M176.11 36.73l-5-8.61a41.53 41.53 0 00-14.73 57.22l8.55-5.12a31.58 31.58 0 0111.19-43.49z"
@@ -11,7 +11,7 @@
           transform="translate(-127.99 .01)" style="isolation:isolate" opacity=".8"></path>
       </g>
     </svg>
-    <svg data-name="layer-2" viewBox="0 0 128 128" class="animate-spin">
+    <svg data-name="layer-2" viewBox="0 0 128 128">
       <g data-name="Main" fill-rule="evenodd">
         <path shape-rendering="geometricPrecision" fill="#fff"
           d="M197 83a19.66 19.66 0 01-19.25-32.57l-4.5-4.27A25.87 25.87 0 00198.59 89z"