Removed Reference Layer

PixiEditor/Models/DataHolders/Document/Document.cs

@@ -38,14 +38,6 @@ namespace PixiEditor.Models.DataHolders
                 + (!ChangesSaved ? " *" : string.Empty);
         }
 
-        private ReferenceLayer referenceLayer;
-
-        public ReferenceLayer ReferenceLayer
-        {
-            get => referenceLayer;
-            set => SetProperty(ref referenceLayer, value);
-        }
-
         private int width;
         public int Width
         {

PixiEditor/Models/Layers/ReferenceLayer.cs

@@ -1,52 +0,0 @@
-using PixiEditor.Models.IO;
-
-namespace PixiEditor.Models.Layers
-{
-    public class ReferenceLayer : Layer
-    {
-        private double referenceWidth;
-
-        public double ReferenceWidth
-        {
-            get => referenceWidth;
-            set => SetProperty(ref referenceWidth, value);
-        }
-
-        private double referenceHeight;
-
-        public double ReferenceHeight
-        {
-            get => referenceHeight;
-            set => SetProperty(ref referenceHeight, value);
-        }
-
-        private string path;
-
-        public string Path
-        {
-            get => path;
-            set => SetProperty(ref path, value);
-        }
-
-        public ReferenceLayer()
-            : this("Reference Layer")
-        {
-        }
-
-        public ReferenceLayer(string name)
-            : base(name)
-        {
-        }
-
-        public ReferenceLayer(string name, string path)
-            : this(name)
-        {
-            LayerBitmap = Importer.ImportImage(path);
-        }
-
-        public void Update()
-        {
-            LayerBitmap = Importer.ImportImage(path);
-        }
-    }
-}

PixiEditor/ViewModels/SubViewModels/Main/LayersViewModel.cs

@@ -40,8 +40,6 @@ namespace PixiEditor.ViewModels.SubViewModels.Main
 
         public RelayCommand MergeWithBelowCommand { get; set; }
 
-        public RelayCommand CreateReferenceLayerCommand { get; set; }
-
         public LayersViewModel(ViewModelMain owner)
             : base(owner)
         {
@@ -60,7 +58,6 @@ namespace PixiEditor.ViewModels.SubViewModels.Main
             RenameGroupCommand = new RelayCommand(RenameGroup);
             DeleteGroupCommand = new RelayCommand(DeleteGroup);
             DeleteSelectedCommand = new RelayCommand(DeleteSelected, CanDeleteSelected);
-            CreateReferenceLayerCommand = new RelayCommand(CreateReferenceLayer);
             Owner.BitmapManager.DocumentChanged += BitmapManager_DocumentChanged;
         }
 
@@ -335,15 +332,6 @@ namespace PixiEditor.ViewModels.SubViewModels.Main
             return Owner.DocumentIsNotNull(null) && index != 0 && Owner.BitmapManager.ActiveDocument.Layers.Count(x => x.IsActive) == 1;
         }
 
-        private void CreateReferenceLayer(object obj)
-        {
-            Owner.BitmapManager.ActiveDocument.ReferenceLayer = new ReferenceLayer("Reference Layer")
-            {
-                ReferenceWidth = Owner.BitmapManager.ActiveDocument.Width,
-                ReferenceHeight = Owner.BitmapManager.ActiveDocument.Height
-            };
-        }
-
         private GuidStructureItem GetGroupFromParameter(object parameter)
         {
             if (parameter is LayerGroupControl)

PixiEditor/Views/MainWindow.xaml

@@ -302,8 +302,7 @@
                                         <usercontrols:LayersManager                                            
                                             LayerCommandsViewModel="{Binding LayersSubViewModel}"
                                             OpacityInputEnabled="{Binding BitmapManager.ActiveDocument, 
-                    Converter={StaticResource NotNullToBoolConverter}}"
-                                            ReferenceLayer="{Binding BitmapManager.ActiveDocument.ReferenceLayer}">
+                    Converter={StaticResource NotNullToBoolConverter}}">
                                             <usercontrols:LayersManager.LayerTreeRoot>
                                                 <MultiBinding Converter="{StaticResource LayersToStructuredLayersConverter}">
                                                     <Binding Path="BitmapManager.ActiveDocument.Layers" />

PixiEditor/Views/UserControls/DrawingViewPort.xaml

@@ -57,11 +57,6 @@
                                    Width="{Binding PreviewLayer.Width}"
                                    Height="{Binding PreviewLayer.Height}" 
                                    Margin="{Binding PreviewLayer.Offset}"/>
-                <Image Source="{Binding ReferenceLayer.LayerBitmap}" Panel.ZIndex="2"
-                                   RenderOptions.BitmapScalingMode="NearestNeighbor" Stretch="Uniform"
-                                   Width="{Binding ReferenceLayer.ReferenceWidth}"
-                                   Height="{Binding ReferenceLayer.ReferenceHeight}" 
-                                   Margin="{Binding ReferenceLayer.Offset}"/>
 
                 <ItemsControl ItemsSource="{Binding Layers}">
                     <ItemsControl.ItemsPanel>

PixiEditor/Views/UserControls/LayersManager.xaml

@@ -12,9 +12,6 @@
              d:DesignHeight="450" d:DesignWidth="250" x:Name="layersManager">
     <UserControl.Resources>
         <converters:IndexOfConverter x:Key="IndexOfConverter"/>
-        <converters:NotNullToVisibiltyConverter x:Key="NotNullToVisibiltyConverter"/>
-        <converters:NotNullToVisibiltyConverter x:Key="NullToVisibiltyConverter" Inverted="True"/>
-        <BoolToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
     </UserControl.Resources>
     <Grid>
         <Grid.RowDefinitions>
@@ -93,26 +90,5 @@
             </TreeView>
             <Border Name="dropBorder" DragEnter="Grid_DragEnter" DragLeave="Grid_DragLeave" AllowDrop="True" Drop="Grid_Drop" Background="Transparent" BorderThickness="0, 5, 0, 0"></Border>
         </DockPanel>
-        <Grid Grid.Row="3">
-            <Grid Visibility="{Binding ReferenceLayer, ElementName=layersManager, Converter={StaticResource NotNullToVisibiltyConverter}}" d:Visibility="Hidden">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition/>
-                    <ColumnDefinition Width="Auto"/>
-                </Grid.ColumnDefinitions>
-                <local:LayerStructureItemContainer Layer="{Binding ReferenceLayer, ElementName=layersManager}" DataContext="{Binding ReferenceLayer, ElementName=layersManager}"/>
-                <Button Grid.Column="1" Content="E" Width="20" Command="{Binding ToggleReferenceLayerEditorCommand, ElementName=layersManager}" CommandParameter="true"/>
-            </Grid>
-            <Grid Visibility="{Binding ReferenceLayer, ElementName=layersManager, Converter={StaticResource NullToVisibiltyConverter}}" d:Visibility="Visible">
-                <Button  Style="{StaticResource BaseDarkButton}" Command="{Binding LayerCommandsViewModel.CreateReferenceLayerCommand, ElementName=layersManager}">
-                    <StackPanel Orientation="Horizontal">
-                        <Image Source="../../Images/layer-add.png" Height="24" Margin="0,0,5,0"/>
-                        <TextBlock FontSize="15" VerticalAlignment="Center">Add Reference Layer</TextBlock>
-                    </StackPanel>
-                </Button>
-            </Grid>
-        </Grid>
-        <local:ReferenceLayerEditor Grid.RowSpan="3" ToggleCommand="{Binding ToggleReferenceLayerEditorCommand, ElementName=layersManager}"
-                                    Visibility="{Binding IsEditingReferenceLayer, ElementName=layersManager, Converter={StaticResource BoolToVisibilityConverter}}" 
-                                    Background="{StaticResource AccentColor}" d:Visibility="Hidden" ReferenceLayer="{Binding ReferenceLayer, ElementName=layersManager}"/>
     </Grid>
 </UserControl>

PixiEditor/Views/UserControls/LayersManager.xaml.cs

@@ -57,29 +57,8 @@ namespace PixiEditor.Views.UserControls
         public static readonly DependencyProperty OpacityInputEnabledProperty =
             DependencyProperty.Register("OpacityInputEnabled", typeof(bool), typeof(LayersManager), new PropertyMetadata(false));
 
-        public ReferenceLayer ReferenceLayer
-        {
-            get => (ReferenceLayer)GetValue(ReferenceLayerProperty);
-            set => SetValue(ReferenceLayerProperty, value);
-        }
-
-        public static readonly DependencyProperty ReferenceLayerProperty =
-            DependencyProperty.Register(nameof(ReferenceLayer), typeof(ReferenceLayer), typeof(LayersManager));
-
-        public bool IsEditingReferenceLayer
-        {
-            get => (bool)GetValue(IsEditingReferenceLayerProperty);
-            set => SetValue(IsEditingReferenceLayerProperty, value);
-        }
-
-        public static readonly DependencyProperty IsEditingReferenceLayerProperty =
-            DependencyProperty.Register(nameof(IsEditingReferenceLayer), typeof(bool), typeof(LayersManager));
-
-        public RelayCommand ToggleReferenceLayerEditorCommand { get; set; }
-
         public LayersManager()
         {
-            ToggleReferenceLayerEditorCommand = new RelayCommand(ToggleReferenceLayerEditor);
             InitializeComponent();
         }
 
@@ -106,11 +85,6 @@ namespace PixiEditor.Views.UserControls
             }
         }
 
-        private void ToggleReferenceLayerEditor(object obj)
-        {
-            IsEditingReferenceLayer = bool.Parse((string)obj);
-        }
-
         private void SetActiveLayerAsSelectedItem(Document doc)
         {
             SelectedItem = doc.ActiveLayer;

PixiEditor/Views/UserControls/ReferenceLayerEditor.xaml

@@ -1,36 +0,0 @@
-<UserControl x:Class="PixiEditor.Views.UserControls.ReferenceLayerEditor"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:PixiEditor.Views.UserControls" xmlns:views="clr-namespace:PixiEditor.Views"
-             mc:Ignorable="d" x:Name="uc"
-             d:DesignHeight="450" d:DesignWidth="400">
-    <UserControl.Resources>
-        <Style TargetType="TextBlock">
-            <Setter Property="Foreground" Value="White"/>
-        </Style>
-    </UserControl.Resources>
-    <DockPanel Margin="5">
-        <TextBox DockPanel.Dock="Top" Text="{Binding ReferenceLayer.Path, ElementName=uc}" Style="{StaticResource DarkTextBoxStyle}"/>
-        <Button DockPanel.Dock="Top" Margin="0,5" Content="Update" Style="{StaticResource DarkRoundButton}" Command="{Binding UpdateReferenceLayerCommand, ElementName=uc}"/>
-        <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
-            <TextBlock VerticalAlignment="Center" Margin="0,0,5,0">Opacity:</TextBlock>
-            <views:NumberInput Value="{Binding ReferenceLayer.Opacity, ElementName=uc}" Width="40" Height="20"
-                               Min="0" Max="100"/>
-            <TextBlock VerticalAlignment="Center" Margin="5,0,0,0">%</TextBlock>
-        </StackPanel>
-        <WrapPanel DockPanel.Dock="Top" Orientation="Horizontal" Margin="0,5">
-            <StackPanel Orientation="Horizontal">
-                <TextBlock VerticalAlignment="Center" Margin="0,0,5,0">Reference Width:</TextBlock>
-                <views:SizeInput Size="{Binding ReferenceLayer.ReferenceWidth, ElementName=uc}" Width="40"/>
-            </StackPanel>
-            <StackPanel Orientation="Horizontal">
-                <TextBlock VerticalAlignment="Center" Margin="5,0">Reference Height:</TextBlock>
-                <views:SizeInput Size="{Binding ReferenceLayer.ReferenceHeight, ElementName=uc}" Width="40"/>
-            </StackPanel>
-        </WrapPanel>
-        <Button DockPanel.Dock="Bottom" Style="{StaticResource DarkRoundButton}" Height="30" VerticalAlignment="Bottom"
-                Command="{Binding ToggleCommand, ElementName=uc}" CommandParameter="false">Close</Button>
-    </DockPanel>
-</UserControl>

PixiEditor/Views/UserControls/ReferenceLayerEditor.xaml.cs

@@ -1,56 +0,0 @@
-using PixiEditor.Helpers;
-using PixiEditor.Models.Layers;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace PixiEditor.Views.UserControls
-{
-    /// <summary>
-    /// Interaction logic for ReferenceLayerEditor.xaml
-    /// </summary>
-    public partial class ReferenceLayerEditor : UserControl
-    {
-        private static readonly DependencyProperty ReferenceLayerProperty =
-            DependencyProperty.Register(nameof(ReferenceLayer), typeof(ReferenceLayer), typeof(ReferenceLayerEditor));
-
-        public ReferenceLayer ReferenceLayer
-        {
-            get => (ReferenceLayer)GetValue(ReferenceLayerProperty);
-            set => SetValue(ReferenceLayerProperty, value);
-        }
-
-        public RelayCommand UpdateReferenceLayerCommand { get; set; }
-
-        private static readonly DependencyProperty ToggleCommandProperty =
-            DependencyProperty.Register(nameof(ToggleCommand), typeof(RelayCommand), typeof(ReferenceLayerEditor));
-
-        public RelayCommand ToggleCommand
-        {
-            get => (RelayCommand)GetValue(ToggleCommandProperty);
-            set => SetValue(ToggleCommandProperty, value);
-        }
-
-        public ReferenceLayerEditor()
-        {
-            UpdateReferenceLayerCommand = new RelayCommand(UpdateReferenceLayer);
-            InitializeComponent();
-        }
-
-        private void UpdateReferenceLayer(object obj)
-        {
-            ReferenceLayer.Update();
-        }
-    }
-}