瀏覽代碼

Null checks and update Pixilonia

flabbet 2 周之前
父節點
當前提交
a03a32acb6

+ 1 - 1
src/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
         <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)Custom.ruleset</CodeAnalysisRuleSet>
-		    <AvaloniaVersion>11.3.9-cibuild0004032-alpha</AvaloniaVersion>
+		    <AvaloniaVersion>11.3.9-cibuild0004033-alpha</AvaloniaVersion>
     </PropertyGroup>
   
   <PropertyGroup Condition="$([MSBuild]::IsOsPlatform('Windows')) AND '$(Platform)' == 'x64'">

+ 1 - 2
src/PixiEditor/Models/DocumentModels/ChangeExecutionController.cs

@@ -181,8 +181,7 @@ internal class ChangeExecutionController
 
     public void MouseMoveInlet(MouseOnCanvasEventArgs args)
     {
-        // Todo: Remove pen restriction when avalonia merges https://github.com/AvaloniaUI/Avalonia/pull/20075
-        if (args.IntermediatePoints != null && args.PointerType == PointerType.Pen)
+        if (args.IntermediatePoints != null)
         {
             foreach (var point in args.IntermediatePoints)
             {

+ 6 - 1
src/PixiEditor/Views/Input/BrushPicker.axaml.cs

@@ -108,7 +108,7 @@ internal partial class BrushPicker : UserControl
     {
         BrushesProperty.Changed.AddClassHandler<BrushPicker>((x, e) =>
         {
-            if (x.SelectedBrush == null && x?.Brushes.Count > 0)
+            if (x.SelectedBrush == null && x?.Brushes?.Count > 0)
             {
                 x.SelectedBrush = x.Brushes[0];
             }
@@ -172,6 +172,8 @@ internal partial class BrushPicker : UserControl
 
     private void UpdateTags()
     {
+        if (Brushes == null)
+            return;
         Categories.Clear();
         foreach (var brush in Brushes)
         {
@@ -249,6 +251,9 @@ internal partial class BrushPicker : UserControl
 
     private void UpdateResults()
     {
+        if (Brushes == null)
+            return;
+
         var filtered = new ObservableCollection<BrushViewModel>();
         if (string.IsNullOrWhiteSpace(SearchText))
         {