Merge pull request #915 from PixiEditor/fixes/30.04.2025

Fixes/30.04.2025

src/PixiEditor.ChangeableDocument/Changeables/Graph/Nodes/Shapes/RemoveClosePointsNode.cs

@@ -31,7 +31,12 @@ public class RemoveClosePointsNode : ShapeNode<PointsVectorData>
         var distance = MinDistance.Value;
         var minDistanceSquared = distance * distance;
 
-        if (distance == 0 || data == null || data.Points == null)
+        if (distance == 0)
+        {
+            return data;
+        }
+
+        if (data?.Points == null)
         {
             return null;
         }

src/PixiEditor.Windows/WindowsOperatingSystem.cs

@@ -37,7 +37,7 @@ public sealed class WindowsOperatingSystem : IOperatingSystem
     public void OpenFolder(string path)
     {
         string dirName = Path.GetDirectoryName(path);
-        string fileName = Path.GetFileName(path);
+        string fileName = !string.IsNullOrEmpty(Path.GetExtension(path)) ? Path.GetFileName(path) : null;
 
         if (dirName == null)
         {
@@ -50,7 +50,7 @@ public sealed class WindowsOperatingSystem : IOperatingSystem
             return;
         }
 
-        WindowsProcessUtility.ShellExecuteEV(dirName);
+        WindowsProcessUtility.ShellExecuteEV(path);
     }
 
     public bool HandleNewInstance(Dispatcher? dispatcher, Action<string, bool> openInExistingAction, IApplicationLifetime lifetime)

src/PixiEditor/Data/Localization/Languages/en.json

@@ -1032,5 +1032,8 @@
   "CUSTOM_BACKGROUND_SCALE": "Custom background scale",
   "PRIMARY_BG_COLOR": "Primary background color",
   "SECONDARY_BG_COLOR": "Secondary background color",
-  "RESET": "Reset"
+  "RESET": "Reset",
+  "AUTOSAVE_OPEN_FOLDER": "Open autosave folder",
+   "AUTOSAVE_OPEN_FOLDER_DESCRIPTIVE": "Open the folder where autosaves are stored",
+  "AUTOSAVE_TOGGLE_DESCRIPTIVE": "Enable/disable autosave"
 }

src/PixiEditor/Helpers/Extensions/PixiParserPixiV4DocumentEx.cs

@@ -162,7 +162,9 @@ internal static class PixiParserPixiV4DocumentEx
                     new KeyFrameData()
                     {
                         AffectedElement = ImageLayerNode.ImageLayerKey,
-                        Data = new ChunkyImage(Surface.Load(layer.ImageBytes), ColorSpace.CreateSrgb()),
+                        Data = layer is { Width: > 0, Height: > 0, ImageBytes.Length: > 0 }
+                            ? new ChunkyImage(Surface.Load(layer.ImageBytes), ColorSpace.CreateSrgb()) :
+                            new ChunkyImage(new VecI(document.Width, document.Height), ColorSpace.CreateSrgb()),
                         Duration = 0,
                         StartFrame = 0,
                         IsVisible = true

src/PixiEditor/Initialization/ClassicDesktopEntry.cs

@@ -61,6 +61,8 @@ internal class ClassicDesktopEntry
 
         InitOperatingSystem();
 
+        bool safeMode = arguments.Contains("--safeMode", StringComparison.OrdinalIgnoreCase);
+
         if (ParseArgument(@"--crash (""?)([\w:\/\ -_.]+)\1", arguments, out Group[] groups))
         {
             try
@@ -92,7 +94,7 @@ internal class ClassicDesktopEntry
         }
 #endif
 
-        var extensionLoader = InitApp();
+        var extensionLoader = InitApp(safeMode);
 
         desktop.MainWindow = new MainWindow(extensionLoader);
         desktop.MainWindow.Show();
@@ -105,7 +107,7 @@ internal class ClassicDesktopEntry
         platform.PerformHandshake();
     }
 
-    public ExtensionLoader InitApp()
+    public ExtensionLoader InitApp(bool safeMode)
     {
         LoadingWindow.ShowInNewThread();
 
@@ -116,7 +118,10 @@ internal class ClassicDesktopEntry
         extensionLoader.AddOfficialExtension("pixieditor.supporterpack",
             new OfficialExtensionData("supporter-pack.snk", AdditionalContentProduct.SupporterPack));
         extensionLoader.AddOfficialExtension("pixieditor.beta", new OfficialExtensionData());
-        extensionLoader.LoadExtensions();
+        if (!safeMode)
+        {
+            extensionLoader.LoadExtensions();
+        }
 
         return extensionLoader;
     }

src/PixiEditor/Models/DocumentModels/UpdateableChangeExecutors/SelectToolExecutor.cs

@@ -7,6 +7,7 @@ using PixiEditor.Models.Handlers.Tools;
 using PixiEditor.Models.Position;
 using PixiEditor.Models.Tools;
 using Drawie.Numerics;
+using PixiEditor.Views.Overlays.SelectionOverlay;
 
 namespace PixiEditor.Models.DocumentModels.UpdateableChangeExecutors;
 #nullable enable
@@ -65,6 +66,7 @@ internal class SelectToolExecutor : UpdateableChangeExecutor
 
     public override void ForceStop()
     {
+
         IAction action = CreateEndAction(selectShape);
         internals!.ActionAccumulator.AddFinishedActions(action);
     }

src/PixiEditor/ViewModels/CrashReportViewModel.cs

@@ -1,12 +1,12 @@
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Threading.Tasks;
+using System.Diagnostics;
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Threading;
+using Avalonia.Controls.ApplicationLifetimes;
 using CommunityToolkit.Mvvm.Input;
 using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Helpers;
+using PixiEditor.Initialization;
+using PixiEditor.Models.Controllers;
 using PixiEditor.Models.Dialogs;
 using PixiEditor.Models.ExceptionHandling;
 using PixiEditor.Views;
@@ -79,6 +79,16 @@ internal partial class CrashReportViewModel : Window
         Application.Current.Run(window);
     }
 
+    [RelayCommand]
+    public void RunInSafeMode()
+    {
+        var app = (App)Application.Current;
+        ClassicDesktopEntry entry = new(app.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime);
+        StartupArgs.Args = new List<string> { "--safeMode" };
+        var window = new MainWindow(entry.InitApp(true), null);
+        Application.Current.Run(window);
+    }
+
     public bool CanRecoverDocuments()
     {
         return hasRecoveredDocuments;
@@ -109,13 +119,4 @@ internal partial class CrashReportViewModel : Window
     {
         IsDebugBuild = true;
     }
-
-    [RelayCommand]
-    private void AttachDebugger()
-    {
-        if (!Debugger.Launch())
-        {
-            /*TODO: MessageBox.Show("Starting debugger failed", "Starting debugger failed", MessageBoxButton.OK, MessageBoxImage.Error);*/
-        }
-    }
 }

src/PixiEditor/ViewModels/SubViewModels/AutosaveViewModel.cs

@@ -5,6 +5,8 @@ using PixiEditor.Models.Commands.Attributes.Commands;
 using PixiEditor.Models.Commands.Attributes.Evaluators;
 using PixiEditor.Models.DocumentModels.Autosave;
 using PixiEditor.Models.IO;
+using PixiEditor.OperatingSystem;
+using PixiEditor.UI.Common.Fonts;
 using PixiEditor.ViewModels.Document;
 
 namespace PixiEditor.ViewModels.SubViewModels;
@@ -13,7 +15,17 @@ internal class AutosaveViewModel(ViewModelMain owner, DocumentManagerViewModel d
 {
     public static bool SaveSessionStateEnabled => IPreferences.Current!.GetPreference(PreferencesConstants.SaveSessionStateEnabled, PreferencesConstants.SaveSessionStateDefault);
 
-    [Command.Basic("PixiEditor.Autosave.ToggleAutosave", "AUTOSAVE_TOGGLE", "AUTOSAVE_TOGGLE_DESCRIPTION",
+    [Command.Basic("PixiEditor.Autosave.OpenAutosaveFolder", "AUTOSAVE_OPEN_FOLDER", "AUTOSAVE_OPEN_FOLDER_DESCRIPTIVE",
+        Icon = PixiPerfectIcons.Folder)]
+    public void OpenAutosaveFolder()
+    {
+        if (Directory.Exists(Paths.PathToUnsavedFilesFolder))
+        {
+            IOperatingSystem.Current.OpenFolder(Paths.PathToUnsavedFilesFolder);
+        }
+    }
+
+    [Command.Basic("PixiEditor.Autosave.ToggleAutosave", "AUTOSAVE_TOGGLE", "AUTOSAVE_TOGGLE_DESCRIPTIVE",
         CanExecute = "PixiEditor.Autosave.HasDocumentAndAutosaveEnabled")]
     public void ToggleAutosave()
     {

src/PixiEditor/ViewModels/SubViewModels/FileViewModel.cs

@@ -117,7 +117,7 @@ internal class FileViewModel : SubViewModel<ViewModelMain>
 
         try
         {
-            if (!args.Contains("--crash"))
+            if (!args.Contains("--crash") && !args.Contains("--safeMode"))
             {
                 var lastCrash = preferences!.GetLocalPreference<string>(PreferencesConstants.LastCrashFile);
 

src/PixiEditor/Views/Dialogs/CrashReportDialog.axaml

@@ -22,19 +22,25 @@
             <Grid Background="{DynamicResource ThemeBackgroundBrush}">
                 <StackPanel Margin="7" VerticalAlignment="Center">
                     <TextBlock Text="{Binding DocumentCount, StringFormat={}{0} file(s) might be recoverable}"
-                               d:Text="2 file(s) can be recovered"/>
+                               d:Text="2 file(s) can be recovered" />
                     <TextBlock TextWrapping="Wrap">You can help the developers fix this bug by sending a crash report that was generated (you will still be able to recover the files).</TextBlock>
                 </StackPanel>
             </Grid>
 
             <WrapPanel Margin="0,20,0,5" Orientation="Horizontal" HorizontalAlignment="Center">
                 <Button Command="{Binding OpenSendCrashReportCommand}"
-                        Width="120">Send report</Button>
+                        Width="120">
+                    Send report
+                </Button>
                 <Button Margin="5,0,5,0" Width="120"
-                        Command="{Binding RecoverDocumentsCommand}">Recover files</Button>
-                <Button IsVisible="{Binding IsDebugBuild}" Width="170"
-                        Command="{Binding AttachDebuggerCommand}">(Re)Attach debugger</Button>
+                        Command="{Binding RecoverDocumentsCommand}">
+                    Recover files
+                </Button>
+                <Button Margin="5,0,5,0" Width="120"
+                        Command="{Binding RunInSafeModeCommand}">
+                    Safe mode
+                </Button>
             </WrapPanel>
         </StackPanel>
     </Grid>
-</Window>
+</Window>

src/PixiEditor/Views/Main/ViewportControls/ViewportOverlays.cs

@@ -147,8 +147,8 @@ internal class ViewportOverlays
     {
         Binding showFillBinding = new()
         {
-            Source = Viewport,
-            Path = "Document.ToolsSubViewModel.ActiveTool",
+            Source = ViewModelMain.Current,
+            Path = "ToolsSubViewModel.ActiveTool",
             Converter = new IsSelectionToolConverter(),
             Mode = BindingMode.OneWay
         };

src/PixiEditor/Views/MainWindow.axaml.cs

@@ -110,7 +110,7 @@ internal partial class MainWindow : Window
             {
                 var app = (App)Application.Current;
                 ClassicDesktopEntry entry = new(app.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime);
-                return new MainWindow(entry.InitApp(), analyticsSession);
+                return new MainWindow(entry.InitApp(false), analyticsSession);
             }
             catch (Exception e)
             {

src/PixiEditor/Views/Windows/HelloTherePopup.axaml.cs

@@ -227,7 +227,7 @@ internal partial class HelloTherePopup : PixiEditorPopup
 
     private void CheckHasClipboardInImage()
     {
-        Task.Run(async () =>
+        Dispatcher.UIThread.InvokeAsync(async () =>
         {
             hasImageInClipboard = await ClipboardController.IsImageInClipboard();
         }).ContinueWith(_ =>

src/global.json

@@ -1,7 +1,7 @@
 {
   "sdk": {
     "version": "8.0.405",
-    "rollForward": "latestMajor",
+    "rollForward": "latestMinor",
     "allowPrerelease": false
   }
 }