Merge remote-tracking branch 'origin/prototype-integration' into prototype-integration

src/PixiEditor/Helpers/Converters/BoolToBrushConverter.cs

@@ -0,0 +1,33 @@
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+using System.Windows.Media;
+
+namespace PixiEditor.Helpers.Converters;
+internal class BoolToBrushConverter : IMultiValueConverter
+{
+    public Brush FalseBrush { get; set; } = Brushes.Black;
+    public Brush TrueBrush { get; set; } = Brushes.White;
+
+    public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+    {
+        if (values.Length == 1)
+        {
+            if (values[0] is not bool conv)
+                return DependencyProperty.UnsetValue;
+            return conv ? TrueBrush : FalseBrush;
+        }
+        else if (values.Length == 2)
+        {
+            if (values[0] is not bool conv || values[1] is not bool conv2)
+                return DependencyProperty.UnsetValue;
+            return (conv || !conv2) ? TrueBrush : FalseBrush;
+        }
+        return DependencyProperty.UnsetValue;
+    }
+
+    public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+    {
+        throw new NotImplementedException();
+    }
+}

src/PixiEditor/Models/DocumentModels/DocumentUpdater.cs

@@ -1,7 +1,6 @@
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using ChunkyImageLib.DataHolders;
-using PixiEditor.ChangeableDocument.Actions;
 using PixiEditor.ChangeableDocument.ChangeInfos;
 using PixiEditor.ChangeableDocument.ChangeInfos.Drawing;
 using PixiEditor.ChangeableDocument.ChangeInfos.Properties;
@@ -229,6 +228,8 @@ internal class DocumentUpdater
         }
         memberVm.SetHasMask(info.HasMask);
         memberVm.RaisePropertyChanged(nameof(memberVm.MaskPreviewBitmap));
+        if (!info.HasMask)
+            memberVm.ShouldDrawOnMask = false;
     }
 
     private void ProcessRefreshViewport(RefreshViewport_PassthroughAction info)

src/PixiEditor/ViewModels/SubViewModels/Document/DocumentViewModel.cs

@@ -40,8 +40,8 @@ internal class DocumentViewModel : NotifyableObject
     }
 
     private string? fullFilePath = null;
-    public string? FullFilePath 
-    { 
+    public string? FullFilePath
+    {
         get => fullFilePath;
         set
         {
@@ -290,6 +290,20 @@ internal class DocumentViewModel : NotifyableObject
         Helpers.ActionAccumulator.AddFinishedActions(new ReplaceColor_Action(oldColor, newColor));
     }
 
+    public void CreateMask(Guid memberGuid)
+    {
+        if (Helpers.ChangeController.IsChangeActive)
+            return;
+        Helpers.ActionAccumulator.AddFinishedActions(new CreateStructureMemberMask_Action(memberGuid));
+    }
+
+    public void DeleteMask(Guid memberGuid)
+    {
+        if (Helpers.ChangeController.IsChangeActive)
+            return;
+        Helpers.ActionAccumulator.AddFinishedActions(new DeleteStructureMemberMask_Action(memberGuid));
+    }
+
     public void SetSelectedMember(Guid memberGuid) => Helpers.ActionAccumulator.AddActions(new SetSelectedMember_PassthroughAction(memberGuid));
 
     public void AddSoftSelectedMember(Guid memberGuid) => Helpers.ActionAccumulator.AddActions(new AddSoftSelectedMember_PassthroughAction(memberGuid));
@@ -304,7 +318,7 @@ internal class DocumentViewModel : NotifyableObject
     public void UseEraserTool() => Helpers.ChangeController.TryStartUpdateableChange<EraserToolExecutor>();
 
     public void UseRectangleTool() => Helpers.ChangeController.TryStartUpdateableChange<RectangleToolExecutor>();
-    
+
     public void UseEllipseTool() => Helpers.ChangeController.TryStartUpdateableChange<EllipseToolExecutor>();
 
     public void UseLineTool() => Helpers.ChangeController.TryStartUpdateableChange<LineToolExecutor>();

src/PixiEditor/ViewModels/SubViewModels/Document/LayerViewModel.cs

@@ -1,5 +1,4 @@
-using PixiEditor.ChangeableDocument.Actions.Generated;
-using PixiEditor.Models.DocumentModels;
+using PixiEditor.Models.DocumentModels;
 
 namespace PixiEditor.ViewModels.SubViewModels.Document;
 #nullable enable
@@ -14,7 +13,11 @@ internal class LayerViewModel : StructureMemberViewModel
     public bool LockTransparencyBindable
     {
         get => lockTransparency;
-        set => Helpers.ActionAccumulator.AddFinishedActions(new LayerLockTransparency_Action(GuidValue, value));
+        set
+        {
+            if (!Document.UpdateableChangeActive)
+                Helpers.ActionAccumulator.AddFinishedActions(new LayerLockTransparency_Action(GuidValue, value));
+        }
     }
     public LayerViewModel(DocumentViewModel doc, DocumentHelpers helpers, Guid guidValue) : base(doc, helpers, guidValue)
     {

src/PixiEditor/ViewModels/SubViewModels/Document/StructureMemberViewModel.cs

@@ -24,7 +24,11 @@ internal abstract class StructureMemberViewModel : INotifyPropertyChanged
     public string NameBindable
     {
         get => name;
-        set => Helpers.ActionAccumulator.AddFinishedActions(new StructureMemberName_Action(GuidValue, value));
+        set
+        {
+            if (!Document.UpdateableChangeActive)
+                Helpers.ActionAccumulator.AddFinishedActions(new StructureMemberName_Action(GuidValue, value));
+        }
     }
 
     private bool isVisible;
@@ -36,7 +40,11 @@ internal abstract class StructureMemberViewModel : INotifyPropertyChanged
     public bool IsVisibleBindable
     {
         get => isVisible;
-        set => Helpers.ActionAccumulator.AddFinishedActions(new StructureMemberIsVisible_Action(value, GuidValue));
+        set
+        {
+            if (!Document.UpdateableChangeActive)
+                Helpers.ActionAccumulator.AddFinishedActions(new StructureMemberIsVisible_Action(value, GuidValue));
+        }
     }
 
     private bool maskIsVisible;
@@ -60,7 +68,11 @@ internal abstract class StructureMemberViewModel : INotifyPropertyChanged
     public BlendMode BlendModeBindable
     {
         get => blendMode;
-        set => Helpers.ActionAccumulator.AddFinishedActions(new StructureMemberBlendMode_Action(value, GuidValue));
+        set
+        {
+            if (!Document.UpdateableChangeActive)
+                Helpers.ActionAccumulator.AddFinishedActions(new StructureMemberBlendMode_Action(value, GuidValue));
+        }
     }
 
     private bool clipToMemberBelowEnabled;
@@ -72,7 +84,11 @@ internal abstract class StructureMemberViewModel : INotifyPropertyChanged
     public bool ClipToMemberBelowEnabledBindable
     {
         get => clipToMemberBelowEnabled;
-        set => Helpers.ActionAccumulator.AddFinishedActions(new StructureMemberClipToMemberBelow_Action(value, GuidValue));
+        set
+        {
+            if (!Document.UpdateableChangeActive)
+                Helpers.ActionAccumulator.AddFinishedActions(new StructureMemberClipToMemberBelow_Action(value, GuidValue));
+        }
     }
 
     private bool hasMask;
@@ -111,7 +127,19 @@ internal abstract class StructureMemberViewModel : INotifyPropertyChanged
     }
 
     public StructureMemberSelectionType Selection { get; set; }
-    public bool ShouldDrawOnMask { get; set; }
+
+    private bool shouldDrawOnMask = false;
+    public bool ShouldDrawOnMask
+    {
+        get => shouldDrawOnMask;
+        set
+        {
+            if (value == shouldDrawOnMask)
+                return;
+            shouldDrawOnMask = value;
+            PropertyChanged?.Invoke(this, new(nameof(ShouldDrawOnMask)));
+        }
+    }
 
     public const int PreviewSize = 48;
     public WriteableBitmap PreviewBitmap { get; set; }

src/PixiEditor/ViewModels/SubViewModels/Main/LayersViewModel.cs

@@ -1,6 +1,5 @@
 using System.Windows.Input;
 using PixiEditor.ChangeableDocument.Enums;
-using PixiEditor.Helpers;
 using PixiEditor.Models.Commands.Attributes.Commands;
 using PixiEditor.Models.Enums;
 using PixiEditor.ViewModels.SubViewModels.Document;
@@ -190,6 +189,56 @@ internal class LayersViewModel : SubViewModel<ViewModelMain>
         }
     }
 
+    [Evaluator.CanExecute("PixiEditor.Layer.ActiveLayerHasMask")]
+    public bool ActiveMemberHasMask() => Owner.DocumentManagerSubViewModel.ActiveDocument?.SelectedStructureMember?.HasMaskBindable ?? false;
+
+    [Evaluator.CanExecute("PixiEditor.Layer.ActiveLayerHasNoMask")]
+    public bool ActiveLayerHasNoMask() => !ActiveMemberHasMask();
+
+    private bool? DoesMaskVisibilityEqual(bool value)
+    {
+        var member = Owner.DocumentManagerSubViewModel.ActiveDocument?.SelectedStructureMember;
+        if (member is null || !member.HasMaskBindable)
+            return false;
+        return member.MaskIsVisibleBindable == value;
+    }
+
+    [Evaluator.CanExecute("PixiEditor.Layer.CanEnableMask")]
+    public bool CanEnableMask() => DoesMaskVisibilityEqual(false) ?? false;
+
+    [Evaluator.CanExecute("PixiEditor.Layer.CanDisableMask")]
+    public bool CanDisableMask() => DoesMaskVisibilityEqual(true) ?? false;
+
+    [Command.Basic("PixiEditor.Layer.EnableMask", "Enable mask", "Enable mask", CanExecute = "PixiEditor.Layer.CanEnableMask", Parameter = true)]
+    [Command.Basic("PixiEditor.Layer.DisableMask", "Disable mask", "Disable mask", CanExecute = "PixiEditor.Layer.CanDisableMask", Parameter = false)]
+    public void ToggleMaskVisibility(bool newVisibility)
+    {
+        var member = Owner.DocumentManagerSubViewModel.ActiveDocument?.SelectedStructureMember;
+        if (member is null || !member.HasMaskBindable || member.MaskIsVisibleBindable == newVisibility)
+            return;
+        member.MaskIsVisibleBindable = newVisibility;
+    }
+
+    [Command.Basic("PixiEditor.Layer.CreateMask", "Create mask", "Create mask", CanExecute = "PixiEditor.Layer.ActiveLayerHasNoMask")]
+    public void CreateMask(object parameter)
+    {
+        var doc = Owner.DocumentManagerSubViewModel.ActiveDocument;
+        var member = doc?.SelectedStructureMember;
+        if (member is null || member.HasMaskBindable)
+            return;
+        doc!.CreateMask(member.GuidValue);
+    }
+
+    [Command.Basic("PixiEditor.Layer.DeleteMask", "Delete mask", "Delete mask", CanExecute = "PixiEditor.Layer.ActiveLayerHasMask")]
+    public void DeleteMask(object parameter)
+    {
+        var doc = Owner.DocumentManagerSubViewModel.ActiveDocument;
+        var member = doc?.SelectedStructureMember;
+        if (member is null || !member.HasMaskBindable)
+            return;
+        doc!.DeleteMask(member.GuidValue);
+    }
+
     [Evaluator.CanExecute("PixiEditor.Layer.HasMemberAbove")]
     public bool HasMemberAbove(object property) => HasSelectedMember(true);
     [Evaluator.CanExecute("PixiEditor.Layer.HasMemberBelow")]

src/PixiEditor/Views/UserControls/Layers/LayerControl.xaml

@@ -11,10 +11,15 @@
              xmlns:behaviors="clr-namespace:PixiEditor.Helpers.Behaviours"
              xmlns:helpers="clr-namespace:PixiEditor.Helpers.UI"
              xmlns:cmds="clr-namespace:PixiEditor.Models.Commands.XAML"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              mc:Ignorable="d" 
              Focusable="True"
-             d:DesignHeight="60" d:DesignWidth="250" Name="uc"
+             d:DesignHeight="35" d:DesignWidth="250" Name="uc"
              MouseLeave="LayerItem_OnMouseLeave" MouseEnter="LayerItem_OnMouseEnter">
+    <UserControl.Resources>
+        <conv:BoolToBrushConverter x:Key="LayerBorderConverter" FalseBrush="White" TrueBrush="Black"/>
+        <conv:BoolToBrushConverter x:Key="MaskBorderConverter" FalseBrush="Black" TrueBrush="White"/>
+    </UserControl.Resources>
     <Border BorderThickness="0 0 0 0.5" BorderBrush="Gray" MinWidth="60" Focusable="True">
         <Border.Background>
             <Binding ElementName="uc" Path="Layer.Selection">
@@ -38,7 +43,7 @@
             <Grid AllowDrop="True" DragEnter="Grid_DragEnter" Drop="Grid_Drop_Top" DragLeave="Grid_DragLeave" Grid.Row="0" Grid.ColumnSpan="3" Background="Transparent"/>
             <Grid Grid.Row="1" Grid.RowSpan="3" Margin="0,-10,0,0" VerticalAlignment="Center" AllowDrop="False">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="30"/>
+                    <ColumnDefinition Width="24"/>
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
                 <CheckBox Style="{StaticResource ImageCheckBox}" VerticalAlignment="Center"
@@ -47,17 +52,69 @@
                       Grid.Column="0" Height="16" />
                 <StackPanel Orientation="Horizontal" Grid.Column="1" HorizontalAlignment="Left">
                     <Rectangle Width="{Binding Path=(helpers:TreeViewItemHelper.Indent).Value, Mode=OneWay, RelativeSource={RelativeSource AncestorType=ItemsPresenter}}" Fill="Transparent" StrokeThickness="0"/>
-                    <Border Width="30" Height="30" BorderThickness="1" BorderBrush="Black" Background="{StaticResource MainColor}"
-                           Margin="5, 0, 10, 0">
+                    <Border 
+                        Width="30" Height="30" 
+                        BorderThickness="1"
+                        Background="{StaticResource MainColor}"
+                        MouseDown="LayerMouseDown">
+                        <Border.BorderBrush>
+                            <MultiBinding Converter="{StaticResource LayerBorderConverter}">
+                                <Binding ElementName="uc" Path="Layer.ShouldDrawOnMask"/>
+                                <Binding ElementName="uc" Path="Layer.HasMaskBindable"/>
+                            </MultiBinding>
+                        </Border.BorderBrush>
                         <Image Source="{Binding Layer.PreviewBitmap,ElementName=uc}" Stretch="Uniform" Width="20" Height="20"
-                       RenderOptions.BitmapScalingMode="NearestNeighbor"/>
+                           RenderOptions.BitmapScalingMode="NearestNeighbor" IsHitTestVisible="False"/>
                     </Border>
-
-                    <controls:EditableTextBlock
-                        x:Name="editableTextBlock"
-                        FontSize="15"
-                        VerticalAlignment="Center"
-                        Text="{Binding Layer.NameBindable, ElementName=uc, Mode=TwoWay}" />
+                    <Border 
+                        Width="30" Height="30" 
+                        BorderThickness="1" 
+                        Background="{StaticResource MainColor}"
+                        Margin="3,0,0,0"
+                        Visibility="{Binding Layer.HasMaskBindable, ElementName=uc, Converter={conv:BoolToVisibilityConverter}}"
+                        MouseDown="MaskMouseDown">
+                        <Border.BorderBrush>
+                            <MultiBinding Converter="{StaticResource MaskBorderConverter}">
+                                <Binding ElementName="uc" Path="Layer.ShouldDrawOnMask"/>
+                            </MultiBinding>
+                        </Border.BorderBrush>
+                        <Grid IsHitTestVisible="False">
+                            <Image Source="{Binding Layer.MaskPreviewBitmap,ElementName=uc}" Stretch="Uniform" Width="20" Height="20"
+                           RenderOptions.BitmapScalingMode="NearestNeighbor" IsHitTestVisible="False"/>
+                            <Path 
+                                Data="M 2 0 L 10 8 L 18 0 L 20 2 L 12 10 L 20 18 L 18 20 L 10 12 L 2 20 L 0 18 L 8 10 L 0 2 Z" 
+                                Fill="{StaticResource PixiRed}" HorizontalAlignment="Center" VerticalAlignment="Center"
+                                Visibility="{Binding Layer.MaskIsVisibleBindable, ElementName=uc, Converter={InverseBoolToVisibilityConverter}}"/>
+                        </Grid>
+                    </Border>
+                    <StackPanel Margin="3,0,5,0">
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock d:Text="100" Foreground="White">
+                                <TextBlock.Text>
+                                    <Binding ElementName="uc" Path="Layer.OpacityBindable" Converter="{conv:MultiplyConverter}" StringFormat="N0">
+                                        <Binding.ConverterParameter>
+                                            <sys:Double>100.0</sys:Double>
+                                        </Binding.ConverterParameter>
+                                    </Binding>
+                                </TextBlock.Text>
+                            </TextBlock>
+                            <TextBlock Foreground="White">%</TextBlock>
+                            <TextBlock 
+                                Margin="5,0,0,0" 
+                                d:Text="Normal" 
+                                Foreground="White" 
+                                Text="{Binding Layer.BlendModeBindable, ElementName=uc, Converter={conv:BlendModeToStringConverter}}"/>
+                        </StackPanel>
+                        <controls:EditableTextBlock
+                            x:Name="editableTextBlock"
+                            FontSize="12"
+                            VerticalAlignment="Center"
+                            d:Text="New Layer"
+                            Text="{Binding Layer.NameBindable, ElementName=uc, Mode=TwoWay}" />
+                    </StackPanel>
+                    <WrapPanel Orientation="Vertical">
+                        
+                    </WrapPanel>
                 </StackPanel>
                 <Grid Margin="0, 0, 0, -2.5" DragEnter="Grid_DragEnter" VerticalAlignment="Bottom" Height="10" Drop="Grid_Drop_Below"  DragLeave="Grid_DragLeave" Grid.Row="2" Grid.Column="0" AllowDrop="True"  Background="Transparent" Name="dropBelowGrid"/>
                 <Grid Margin="0, 0, 0, -2.5" VerticalAlignment="Bottom" Height="10" Grid.Row="2" Grid.Column="1" Background="{Binding ElementName=dropBelowGrid, Path=Background}"/>
@@ -73,6 +130,11 @@
                 <MenuItem Header="Move upwards" Command="{cmds:Command PixiEditor.Layer.MoveSelectedMemberUpwards}"/>
                 <MenuItem Header="Move downwards" Command="{cmds:Command PixiEditor.Layer.MoveSelectedMemberDownwards}"/>
                 <Separator/>
+                <MenuItem Header="Create mask" Command="{cmds:Command PixiEditor.Layer.CreateMask}"/>
+                <MenuItem Header="Delete mask" Command="{cmds:Command PixiEditor.Layer.DeleteMask}"/>
+                <MenuItem Header="Enable mask" Command="{cmds:Command PixiEditor.Layer.EnableMask}"/>
+                <MenuItem Header="Disable mask" Command="{cmds:Command PixiEditor.Layer.DisableMask}"/>
+                <Separator/>
                 <MenuItem Header="Merge selected" Command="{cmds:Command PixiEditor.Layer.MergeSelected}"/>
                 <MenuItem Header="Merge with above" Command="{cmds:Command PixiEditor.Layer.MergeWithAbove}"/>
                 <MenuItem Header="Merge with below" Command="{cmds:Command PixiEditor.Layer.MergeWithBelow}"/>

src/PixiEditor/Views/UserControls/Layers/LayerControl.xaml.cs

@@ -136,4 +136,16 @@ internal partial class LayerControl : UserControl
     {
         editableTextBlock.EnableEditing();
     }
+
+    private void MaskMouseDown(object sender, MouseButtonEventArgs e)
+    {
+        if (Layer is not null)
+            Layer.ShouldDrawOnMask = true;
+    }
+
+    private void LayerMouseDown(object sender, MouseButtonEventArgs e)
+    {
+        if (Layer is not null)
+            Layer.ShouldDrawOnMask = false;
+    }
 }