Bläddra i källkod

Updated version and brush overlay hiding

Krzysztof Krysiński 1 vecka sedan
förälder
incheckning
e2886c2760

+ 24 - 0
src/PixiEditor/Helpers/Converters/InlineConverter.cs

@@ -0,0 +1,24 @@
+using System.Globalization;
+using Avalonia.Data.Converters;
+
+namespace PixiEditor.Helpers.Converters;
+
+public class InlineConverter : IValueConverter
+{
+    Func<object?, bool>? simpleConvert;
+
+    public InlineConverter(Func<object, bool> simpleConvert)
+    {
+        this.simpleConvert = simpleConvert;
+    }
+
+    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        return simpleConvert?.Invoke(value);
+    }
+
+    public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        throw new NotImplementedException();
+    }
+}

+ 1 - 1
src/PixiEditor/Models/Serialization/Factories/ChunkyImageSerializationFactory.cs

@@ -36,7 +36,7 @@ public class ChunkyImageSerializationFactory : SerializationFactory<byte[], Chun
     {
         SurfaceSerializationFactory surfaceFactory = new();
         surfaceFactory.Config = Config;
-        if (IsFilePreVersion(serializerData, new Version(2, 0, 1, 19)) || serializerData == default)
+        if (IsFilePreVersion(serializerData, new Version(2, 1, 0, 0)) || serializerData == default)
         {
             if (serialized is byte[] imgBytes)
             {

+ 2 - 2
src/PixiEditor/Properties/AssemblyInfo.cs

@@ -43,5 +43,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.1.19")]
-[assembly: AssemblyFileVersion("2.0.1.19")]
+[assembly: AssemblyVersion("2.1.0.0")]
+[assembly: AssemblyFileVersion("2.1.0.0")]

+ 11 - 1
src/PixiEditor/Views/Main/ViewportControls/ViewportOverlays.cs

@@ -6,6 +6,7 @@ using Avalonia.Input;
 using PixiEditor.Views.Visuals;
 using PixiEditor.Helpers.Converters;
 using PixiEditor.Models.Commands.XAML;
+using PixiEditor.Models.Handlers.Tools;
 using PixiEditor.ViewModels;
 using PixiEditor.ViewModels.Document.TransformOverlays;
 using PixiEditor.Views.Overlays;
@@ -461,6 +462,14 @@ internal class ViewportOverlays
             Source = ViewModelMain.Current.ToolsSubViewModel, Path = "ActiveBrushToolbar.LastBrushData", Mode = BindingMode.OneWay
         };
 
+        Binding isBrushToolActiveBinding = new()
+        {
+            Source = ViewModelMain.Current,
+            Path = "ToolsSubViewModel.ActiveTool",
+            Converter = new InlineConverter(obj => obj is IBrushToolHandler),
+            Mode = BindingMode.OneWay
+        };
+
         MultiBinding isVisibleMultiBinding = new()
         {
             Converter = new AllTrueConverter(),
@@ -468,7 +477,8 @@ internal class ViewportOverlays
             Bindings = new List<IBinding>()
             {
                 isTransformingBinding,
-                isOverCanvasBinding
+                isOverCanvasBinding,
+                isBrushToolActiveBinding
             }
         };