Merge pull request #15 from wieslawsoltes/TransformGeometry

Add TransformGeometry option
wieslawsoltes · Dec 9, 2023 · 43b6e89 · 43b6e89
2 parents d4422ff + bb53f49
commit 43b6e89
Show file tree

Hide file tree

Showing 11 changed files with 233 additions and 241 deletions.
diff --git a/src/SvgToXaml.Base/ViewModels/MainWindowViewModel.cs b/src/SvgToXaml.Base/ViewModels/MainWindowViewModel.cs
@@ -451,6 +451,7 @@ private async Task Clipboard(string? format)
                 {
                     UseCompatMode = Project.Settings.UseCompatMode,
                     ReuseExistingResources = Project.Settings.ReuseExistingResources,
+                    TransformGeometry = Project.Settings.TransformGeometry,
                     Resources = Project.Settings.UseResources ? new ResourceDictionary() : null
                 };
 
@@ -463,6 +464,7 @@ private async Task Clipboard(string? format)
                 {
                     UseCompatMode = Project.Settings.UseCompatMode,
                     ReuseExistingResources = Project.Settings.ReuseExistingResources,
+                    TransformGeometry = Project.Settings.TransformGeometry,
                     Resources = Project.Settings.UseResources ? new ResourceDictionary() : null
                 };
 
@@ -540,6 +542,7 @@ private async Task<string> ToXaml(FileItemViewModel fileItemViewModel, bool enab
                         UseCompatMode = Project.Settings.UseCompatMode,
                         AddTransparentBackground = Project.Settings.AddTransparentBackground,
                         ReuseExistingResources = Project.Settings.ReuseExistingResources,
+                        TransformGeometry = Project.Settings.TransformGeometry,
                         Resources = Project.Settings.UseResources ? new ResourceDictionary() : null
                     };
 
@@ -553,6 +556,7 @@ private async Task<string> ToXaml(FileItemViewModel fileItemViewModel, bool enab
                         UseCompatMode = Project.Settings.UseCompatMode,
                         AddTransparentBackground = Project.Settings.AddTransparentBackground,
                         ReuseExistingResources = Project.Settings.ReuseExistingResources,
+                        TransformGeometry = Project.Settings.TransformGeometry,
                         Resources = Project.Settings.UseResources ? new ResourceDictionary() : null
                     };
 
@@ -573,6 +577,7 @@ private async Task<string> ToXamlStyles(List<InputItem> inputItems)
             {
                 UseCompatMode = Project.Settings.UseCompatMode, 
                 ReuseExistingResources = Project.Settings.ReuseExistingResources,
+                TransformGeometry = Project.Settings.TransformGeometry,
                 Resources = Project.Settings.UseResources ? new ResourceDictionary() : null
             };
 
@@ -638,6 +643,7 @@ public record PreviewItem(string Image, string TabControl);
             {
                 UseCompatMode = Project.Settings.UseCompatMode,
                 ReuseExistingResources = Project.Settings.ReuseExistingResources,
+                TransformGeometry = Project.Settings.TransformGeometry,
                 Resources = Project.Settings.UseResources ? new ResourceDictionary() : null
             };
 

diff --git a/src/SvgToXaml.Base/ViewModels/ProjectViewModel.cs b/src/SvgToXaml.Base/ViewModels/ProjectViewModel.cs
@@ -42,6 +42,7 @@ public ProjectViewModel()
             EnableGeneratePreview = true,
             UseResources = true,
             ReuseExistingResources = true,
+            TransformGeometry = true,
             UseCompatMode = false,
             AddTransparentBackground = true,
             IgnoreOpacity = false,

diff --git a/src/SvgToXaml.Base/ViewModels/SettingsViewModel.cs b/src/SvgToXaml.Base/ViewModels/SettingsViewModel.cs
@@ -8,6 +8,7 @@ public class SettingsViewModel : ViewModelBase
     private bool _enableGeneratePreview;
     private bool _useResources;
     private bool _reuseExistingResources;
+    private bool _transformGeometry;
     private bool _useCompatMode;
     private bool _addTransparentBackground;
     private bool _ignoreOpacity;
@@ -43,6 +44,13 @@ public bool ReuseExistingResources
         set => SetProperty(ref _reuseExistingResources, value);
     }
 
+    [JsonInclude]
+    public bool TransformGeometry
+    {
+        get => _transformGeometry;
+        set => SetProperty(ref _transformGeometry, value);
+    }
+
     [JsonInclude]
     public bool UseCompatMode
     {

diff --git a/src/SvgToXaml.Base/Views/SettingsView.axaml b/src/SvgToXaml.Base/Views/SettingsView.axaml
@@ -37,6 +37,12 @@
               HorizontalContentAlignment="Stretch"
               Margin="0"
               Padding="6"/>
+    <CheckBox IsChecked="{Binding TransformGeometry}"
+              Content="Transform Geometry"
+              HorizontalAlignment="Stretch"
+              HorizontalContentAlignment="Stretch"
+              Margin="0"
+              Padding="6"/>
     <CheckBox IsChecked="{Binding UseCompatMode}"
               Content="Use Compat Mode"
               HorizontalAlignment="Stretch"

diff --git a/src/SvgToXaml.Web/AppBundle/main.js b/src/SvgToXaml.Web/AppBundle/main.js
@@ -1,5 +1,4 @@
 import { dotnet } from './dotnet.js'
-import { registerAvaloniaModule } from './avalonia.js';
 
 const is_browser = typeof window != "undefined";
 if (!is_browser) throw new Error(`Expected to be running in a browser`);
@@ -9,8 +8,6 @@ const dotnetRuntime = await dotnet
     .withApplicationArgumentsFromQuery()
     .create();
 
-await registerAvaloniaModule(dotnetRuntime);
-
 const config = dotnetRuntime.getConfig();
 
 await dotnetRuntime.runMainAndExit(config.mainAssemblyName, [window.location.search]);
diff --git a/src/SvgToXamlConverter/Generator/GeneratorBase.cs b/src/SvgToXamlConverter/Generator/GeneratorBase.cs