Displaying layers wip

PixiEditorDotNetCore3/Models/Colors/ExColor.cs

@@ -1,6 +1,6 @@
 using System.Windows.Media;
 
-namespace PixiEditorDotNetCore3.Models.Colors
+namespace PixiEditor.Models.Colors
 {
     public static class ExColor
     {

PixiEditorDotNetCore3/Models/Controllers/BitmapOperationsUtility.cs

@@ -1,13 +1,16 @@
 using PixiEditor.Helpers;
 using PixiEditor.Models.Controllers;
-using PixiEditorDotNetCore3.Models.Layers;
-using PixiEditorDotNetCore3.Models.Position;
-using PixiEditorDotNetCore3.Models.Tools;
+using PixiEditor.Models.Enums;
+using PixiEditor.Models.Layers;
+using PixiEditor.Models.Position;
+using PixiEditor.Models.Tools;
 using System;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
+using System.Linq;
 using System.Windows.Input;
 using System.Windows.Media;
+using System.Windows.Media.Imaging;
 
 namespace PixiEditor.Models.Controllers
 {
@@ -42,6 +45,7 @@ namespace PixiEditor.Models.Controllers
         public int ToolSize { get; set; }
 
         public event EventHandler<BitmapChangedEventArgs> BitmapChanged;
+        public event EventHandler<LayersChangedEventArgs> LayersChanged;
 
         public BitmapOperationsUtility()
         {
@@ -70,12 +74,43 @@ namespace PixiEditor.Models.Controllers
             {
                 ActiveLayerIndex = 0;
             }
+            LayersChanged?.Invoke(this, new LayersChangedEventArgs(0, LayerAction.Add));
         }
 
         public void SetActiveLayer(int index)
         {
             ActiveLayerIndex = index;
+            LayersChanged?.Invoke(this, new LayersChangedEventArgs(index, LayerAction.SetActive));
         }
+
+        public WriteableBitmap GetCombinedBitmaps()
+        {
+            Layer[] visibleLayers = Layers.Where(x => x.IsVisible).ToArray();
+            visibleLayers.Reverse();
+            int width = visibleLayers[0].Width;
+            int height = visibleLayers[0].Height;
+            WriteableBitmap finalBitmap = BitmapFactory.New(width, height);
+            finalBitmap.Lock();
+            finalBitmap = WriteLayersToBitmap(finalBitmap, visibleLayers);
+            finalBitmap.Unlock();
+            return finalBitmap;
+        }
+
+        private WriteableBitmap WriteLayersToBitmap(WriteableBitmap targetBitmap, Layer[] layers)
+        {
+            for (int i = 0; i < layers.Length; i++)
+            {
+                Coordinates[] nonTransparentCords = layers[i].GetNonTransprarentPixels();
+                for (int j = 0; j < nonTransparentCords.Length; j++)
+                {
+                    int x = nonTransparentCords[j].X;
+                    int y = nonTransparentCords[j].Y;
+                    targetBitmap.SetPixel(x, y, layers[i].LayerBitmap.GetPixel(x,y));
+                }
+            }
+            return targetBitmap;
+        }
+
     }
 }
 
@@ -90,3 +125,15 @@ public class BitmapChangedEventArgs : EventArgs
         ChangedLayerIndex = changedLayerIndex;
     }
 }
+
+public class LayersChangedEventArgs : EventArgs
+{
+    public int LayerAffected { get; set; }
+    public LayerAction LayerChangeType { get; set; }
+
+    public LayersChangedEventArgs(int layerAffected, LayerAction layerChangeType)
+    {
+        LayerAffected = layerAffected;
+        LayerChangeType = layerChangeType;
+    }
+}

PixiEditorDotNetCore3/Models/Controllers/MouseMovementController.cs

@@ -1,4 +1,4 @@
-using PixiEditorDotNetCore3.Models.Position;
+using PixiEditor.Models.Position;
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -16,6 +16,7 @@ namespace PixiEditor.Models.Controllers
         {
             if (IsRecordingChanges == false)
             {
+                LastMouseMoveCoordinates.Clear();
                 IsRecordingChanges = true;
             }
         }

PixiEditorDotNetCore3/Models/Controllers/UndoManager.cs

@@ -1,4 +1,4 @@
-using PixiEditorDotNetCore3.Models.DataHolders;
+using PixiEditor.Models.DataHolders;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;

PixiEditorDotNetCore3/Models/DataHolders/Change.cs

@@ -5,7 +5,7 @@ using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PixiEditorDotNetCore3.Models.DataHolders
+namespace PixiEditor.Models.DataHolders
 {
     [Serializable]
     public class Change

PixiEditorDotNetCore3/Models/DataHolders/StackEx.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PixiEditorDotNetCore3.Models.DataHolders
+namespace PixiEditor.Models.DataHolders
 {
     public class StackEx<T>
     {
@@ -25,9 +25,9 @@ namespace PixiEditorDotNetCore3.Models.DataHolders
             items.Clear();
         }
 
-        /// <summary>
-        /// Returns top object without deleting it.
-        /// </summary>
+        /// <summary>
+        /// Returns top object without deleting it.
+        /// </summary>
         /// <returns>Returns n - 1 item from stack.</returns>
         public T Peek()
         {

PixiEditorDotNetCore3/Models/DataHolders/Tuple.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace PixiEditorDotNetCore3.Models.DataHolders
+namespace PixiEditor.Models.DataHolders
 {
     public class Tuple<T1, T2, T3> : IEquatable<object>
     {

PixiEditorDotNetCore3/Models/Dialogs/CustomDialog.cs

@@ -7,7 +7,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
 
-namespace PixiEditorDotNetCore3.Models.Dialogs
+namespace PixiEditor.Models.Dialogs
 {
     public abstract class CustomDialog : NotifyableObject
     {

PixiEditorDotNetCore3/Models/Dialogs/ExportFileDialog.cs

@@ -7,7 +7,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
 
-namespace PixiEditorDotNetCore3.Models.Dialogs
+namespace PixiEditor.Models.Dialogs
 {
     public class ExportFileDialog : CustomDialog
     {

PixiEditorDotNetCore3/Models/Dialogs/ImportFileDialog.cs

@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
 
-namespace PixiEditorDotNetCore3.Models.Dialogs
+namespace PixiEditor.Models.Dialogs
 {
     class ImportFileDialog : CustomDialog
     {

PixiEditorDotNetCore3/Models/Dialogs/NewFileDialog.cs

@@ -7,7 +7,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
 
-namespace PixiEditorDotNetCore3.Models.Dialogs
+namespace PixiEditor.Models.Dialogs
 {
     public class NewFileDialog : CustomDialog
     {

PixiEditorDotNetCore3/Models/Enums/FileType.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PixiEditorDotNetCore3.Models.Enums
+namespace PixiEditor.Models.Enums
 {
     public enum FileType
     {

PixiEditorDotNetCore3/Models/Enums/MouseAction.cs → PixiEditorDotNetCore3/Models/Enums/LayerAction.cs

@@ -4,8 +4,8 @@ using System.Text;
 
 namespace PixiEditor.Models.Enums
 {
-    public enum MouseAction
+    public enum LayerAction
     {
-        Move, MouseDown, MouseUp
+        Add, Remove, Move, SetActive
     }
 }

PixiEditorDotNetCore3/Models/IO/Exporter.cs

@@ -10,10 +10,10 @@ using System.Windows.Controls;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using Microsoft.Win32;
-using PixiEditorDotNetCore3.Models.Dialogs;
-using PixiEditorDotNetCore3.Models.Enums;
+using PixiEditor.Models.Dialogs;
+using PixiEditor.Models.Enums;
 
-namespace PixiEditorDotNetCore3.Models.IO
+namespace PixiEditor.Models.IO
 {
     public class Exporter
     {

PixiEditorDotNetCore3/Models/IO/Importer.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using System.Windows.Media.Imaging;
 using System.Windows.Media;
 
-namespace PixiEditorDotNetCore3.Models.IO
+namespace PixiEditor.Models.IO
 {
     public class Importer : NotifyableObject
     {

PixiEditorDotNetCore3/Models/IO/PixiFilesManager.cs

@@ -5,7 +5,7 @@ using System.IO;
 using System.Text;
 using Newtonsoft.Json;
 
-namespace PixiEditorDotNetCore3.Models.IO
+namespace PixiEditor.Models.IO
 {
     public static class PixiFilesManager
     {

PixiEditorDotNetCore3/Models/Images/BitmapConverter.cs

@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
-namespace PixiEditorDotNetCore3.Models.Images
+namespace PixiEditor.Models.Images
 {
     public static class BitmapConverter
     {

PixiEditorDotNetCore3/Models/Images/ImageGenerator.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using System.Windows.Controls;
 using System.Windows.Media;
 
-namespace PixiEditorDotNetCore3.Models.Images
+namespace PixiEditor.Models.Images
 {
     public static class ImageGenerator
     {

PixiEditorDotNetCore3/Models/Layers/BasicLayer.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using System.Windows.Controls;
 using PixiEditor.Helpers;
 
-namespace PixiEditorDotNetCore3.Models.Layers
+namespace PixiEditor.Models.Layers
 {
     [Serializable]
     public class BasicLayer : NotifyableObject

PixiEditorDotNetCore3/Models/Layers/Layer.cs

@@ -1,13 +1,10 @@
-using PixiEditorDotNetCore3.Models.Tools;
+using PixiEditor.Models.Position;
+using PixiEditor.Models.Tools;
 using System;
-using System.ComponentModel;
-using System.Runtime.InteropServices;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Media;
+using System.Collections.Generic;
 using System.Windows.Media.Imaging;
 
-namespace PixiEditorDotNetCore3.Models.Layers
+namespace PixiEditor.Models.Layers
 {
     public class Layer : BasicLayer
     {
@@ -25,7 +22,7 @@ namespace PixiEditorDotNetCore3.Models.Layers
             }
         }
 
-        public Layer(string name,int width, int height)
+        public Layer(string name, int width, int height)
         {
             Name = name;
             Layer layer = LayerGenerator.Generate(width, height);
@@ -55,6 +52,21 @@ namespace PixiEditorDotNetCore3.Models.Layers
             LayerBitmap.Unlock();
         }
 
+        public Coordinates[] GetNonTransprarentPixels()
+        {
+            List<Coordinates> coordinates = new List<Coordinates>();
+            for (int y = 0; y < Height; y++)
+            {
+                for (int x = 0; x < Width; x++)
+                {
+                    if (LayerBitmap.GetPixeli(x, y) != 0)
+                    {
+                        coordinates.Add(new Coordinates(x, y));
+                    }
+                }
+            }
+            return coordinates.ToArray();
+        }
 
         public byte[] ConvertBitmapToBytes()
         {            

PixiEditorDotNetCore3/Models/Layers/LayerGenerator.cs

@@ -1,4 +1,4 @@
-using PixiEditorDotNetCore3.Models.Tools;
+using PixiEditor.Models.Tools;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -10,7 +10,7 @@ using System.Windows.Controls;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
-namespace PixiEditorDotNetCore3.Models.Layers
+namespace PixiEditor.Models.Layers
 {
     public static class LayerGenerator
     {

PixiEditorDotNetCore3/Models/Layers/LightLayer.cs

@@ -8,7 +8,7 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using PixiEditor.Helpers;
 
-namespace PixiEditorDotNetCore3.Models.Layers
+namespace PixiEditor.Models.Layers
 {
     [Serializable]
     public class LightLayer : BasicLayer

PixiEditorDotNetCore3/Models/Position/Coordinates.cs

@@ -1,31 +1,31 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PixiEditorDotNetCore3.Models.Position
-{
-    public struct Coordinates
-    {
-        public int X { get; set; }
-
-        public int Y { get; set; }
-
-        public Coordinates(int x, int y)
-        {
-            X = x;
-            Y = y;
-        }
-
-        public override string ToString() => $"x: {X}, y: {Y}";
-
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PixiEditor.Models.Position
+{
+    public struct Coordinates
+    {
+        public int X { get; set; }
+
+        public int Y { get; set; }
+
+        public Coordinates(int x, int y)
+        {
+            X = x;
+            Y = y;
+        }
+
+        public override string ToString() => $"x: {X}, y: {Y}";
+
         public static bool operator ==(Coordinates c1, Coordinates c2)
         {
             if (c1 == null || c2 == null) return false;
             return c2.X == c1.X && c2.Y == c1.Y;
-        }
-
+        }
+
         public static bool operator !=(Coordinates c1, Coordinates c2)
         {
             return !(c1 == c2);
@@ -49,6 +49,6 @@ namespace PixiEditorDotNetCore3.Models.Position
                 hash = (hash * HashingMultiplier) ^ (!ReferenceEquals(null, Y) ? Y.GetHashCode() : 0);            
                 return hash;
             }
-        }
-    }
-}
+        }
+    }
+}

PixiEditorDotNetCore3/Models/Position/CoordinatesCalculator.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace PixiEditorDotNetCore3.Models.Position
+namespace PixiEditor.Models.Position
 {
     public static class CoordinatesCalculator
     {

PixiEditorDotNetCore3/Models/Position/DoubleCords.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PixiEditorDotNetCore3.Models.Position
+namespace PixiEditor.Models.Position
 {
     public class DoubleCords
     {

PixiEditorDotNetCore3/Models/Position/MousePositionConverter.cs

@@ -1,7 +1,7 @@
-using PixiEditorDotNetCore3.Models.Layers;
+using PixiEditor.Models.Layers;
 using System.Windows;
 
-namespace PixiEditorDotNetCore3.Models.Position
+namespace PixiEditor.Models.Position
 {
     public static class MousePositionConverter
     {

PixiEditorDotNetCore3/Models/Tools/BitmapPixelChanges.cs

@@ -1,10 +1,10 @@
-using PixiEditorDotNetCore3.Models.Position;
+using PixiEditor.Models.Position;
 using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Windows.Media;
 
-namespace PixiEditorDotNetCore3.Models.Tools
+namespace PixiEditor.Models.Tools
 {
     public struct BitmapPixelChanges
     {
@@ -15,14 +15,14 @@ namespace PixiEditorDotNetCore3.Models.Tools
             ChangedPixels = changedPixels;
         }
 
-        public static BitmapPixelChanges FromSingleColoredArray(Coordinates[] coordinates, Color color)
-        {
-            Dictionary<Coordinates, Color> dict = new Dictionary<Coordinates, Color>();
-            for (int i = 0; i < coordinates.Length; i++)
-            {
-                dict.Add(coordinates[i], color);
-            }
-            return new BitmapPixelChanges(dict);
+        public static BitmapPixelChanges FromSingleColoredArray(Coordinates[] coordinates, Color color)
+        {
+            Dictionary<Coordinates, Color> dict = new Dictionary<Coordinates, Color>();
+            for (int i = 0; i < coordinates.Length; i++)
+            {
+                dict.Add(coordinates[i], color);
+            }
+            return new BitmapPixelChanges(dict);
         }
     }
 }

PixiEditorDotNetCore3/Models/Tools/ShapeTool.cs

@@ -1,11 +1,11 @@
-using PixiEditorDotNetCore3.Models.Layers;
-using PixiEditorDotNetCore3.Models.Position;
+using PixiEditor.Models.Layers;
+using PixiEditor.Models.Position;
 using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Windows.Media;
 
-namespace PixiEditorDotNetCore3.Models.Tools
+namespace PixiEditor.Models.Tools
 {
     public abstract class ShapeTool : Tool
     {

PixiEditorDotNetCore3/Models/Tools/Tool.cs

@@ -1,11 +1,11 @@
-using PixiEditorDotNetCore3.Models.Layers;
-using PixiEditorDotNetCore3.Models.Position;
+using PixiEditor.Models.Layers;
+using PixiEditor.Models.Position;
 using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Windows.Media;
 
-namespace PixiEditorDotNetCore3.Models.Tools
+namespace PixiEditor.Models.Tools
 {
     public abstract class Tool
     {

PixiEditorDotNetCore3/Models/Tools/ToolType.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PixiEditorDotNetCore3.Models.Tools
+namespace PixiEditor.Models.Tools
 {
     public enum ToolType
     {

PixiEditorDotNetCore3/Models/Tools/Tools/BrightnessTool.cs

@@ -1,11 +1,11 @@
-using PixiEditorDotNetCore3.Models.Colors;
-using PixiEditorDotNetCore3.Models.Layers;
-using PixiEditorDotNetCore3.Models.Position;
+using PixiEditor.Models.Colors;
+using PixiEditor.Models.Layers;
+using PixiEditor.Models.Position;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
-namespace PixiEditorDotNetCore3.Models.Tools.Tools
+namespace PixiEditor.Models.Tools.Tools
 {
     public class BrightnessTool : Tool
     {

PixiEditorDotNetCore3/Models/Tools/Tools/CircleTool.cs

@@ -1,9 +1,9 @@
-using PixiEditorDotNetCore3.Models.Layers;
-using PixiEditorDotNetCore3.Models.Position;
+using PixiEditor.Models.Layers;
+using PixiEditor.Models.Position;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
-namespace PixiEditorDotNetCore3.Models.Tools.Tools
+namespace PixiEditor.Models.Tools.Tools
 {
     public class CircleTool : ShapeTool
     {

PixiEditorDotNetCore3/Models/Tools/Tools/EarserTool.cs

@@ -1,11 +1,11 @@
-using PixiEditorDotNetCore3.Models.Layers;
-using PixiEditorDotNetCore3.Models.Position;
+using PixiEditor.Models.Layers;
+using PixiEditor.Models.Position;
 using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Windows.Media;
 
-namespace PixiEditorDotNetCore3.Models.Tools.Tools
+namespace PixiEditor.Models.Tools.Tools
 {
     public class EarserTool : Tool
     {

PixiEditorDotNetCore3/Models/Tools/Tools/FloodFill.cs

@@ -1,11 +1,11 @@
-using PixiEditorDotNetCore3.Models.Layers;
-using PixiEditorDotNetCore3.Models.Position;
+using PixiEditor.Models.Layers;
+using PixiEditor.Models.Position;
 using System;
 using System.Collections.Generic;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
-namespace PixiEditorDotNetCore3.Models.Tools.Tools
+namespace PixiEditor.Models.Tools.Tools
 {
     public class FloodFill : Tool
     {
@@ -25,28 +25,31 @@ namespace PixiEditorDotNetCore3.Models.Tools.Tools
         {
             List<Coordinates> changedCoords = new List<Coordinates>();
 
-            Color colorToReplace = layer.LayerBitmap.GetPixel(startingCoords.X, startingCoords.Y);
+            WriteableBitmap bitmap = layer.LayerBitmap.Clone();
+            Color colorToReplace = bitmap.GetPixel(startingCoords.X, startingCoords.Y);
 
             var stack = new Stack<Tuple<int, int>>();
             stack.Push(Tuple.Create(startingCoords.X, startingCoords.Y));
 
+            bitmap.Lock();
             while (stack.Count > 0)
             {
                 var point = stack.Pop();
                 if (point.Item1 < 0 || point.Item1 > layer.Height - 1) continue;
                 if (point.Item2 < 0 || point.Item2 > layer.Width - 1) continue;
-                if (layer.LayerBitmap.GetPixel(point.Item1, point.Item2) == newColor) continue;
+                if (bitmap.GetPixel(point.Item1, point.Item2) == newColor) continue;
 
-                if (layer.LayerBitmap.GetPixel(point.Item1, point.Item2) == colorToReplace)
+                if (bitmap.GetPixel(point.Item1, point.Item2) == colorToReplace)
                 {
                     changedCoords.Add(new Coordinates(point.Item1, point.Item2));
-                    layer.LayerBitmap.SetPixel(point.Item1, point.Item2, newColor);
+                    bitmap.SetPixel(point.Item1, point.Item2, newColor);
                     stack.Push(Tuple.Create(point.Item1, point.Item2 - 1));
                     stack.Push(Tuple.Create(point.Item1 + 1, point.Item2));
                     stack.Push(Tuple.Create(point.Item1, point.Item2 + 1));
                     stack.Push(Tuple.Create(point.Item1 - 1, point.Item2));
                 }
             }
+            bitmap.Unlock();
             return BitmapPixelChanges.FromSingleColoredArray(changedCoords.ToArray(), newColor);
         }
     }

PixiEditorDotNetCore3/Models/Tools/Tools/LineTool.cs

@@ -1,9 +1,9 @@
-using PixiEditorDotNetCore3.Models.Layers;
-using PixiEditorDotNetCore3.Models.Position;
+using PixiEditor.Models.Layers;
+using PixiEditor.Models.Position;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
-namespace PixiEditorDotNetCore3.Models.Tools.Tools
+namespace PixiEditor.Models.Tools.Tools
 {
     public class LineTool : ShapeTool
     {

PixiEditorDotNetCore3/Models/Tools/Tools/PenTool.cs

@@ -1,11 +1,11 @@
-using PixiEditorDotNetCore3.Models.Layers;
-using PixiEditorDotNetCore3.Models.Position;
+using PixiEditor.Models.Layers;
+using PixiEditor.Models.Position;
 using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Windows.Media;
 
-namespace PixiEditorDotNetCore3.Models.Tools.Tools
+namespace PixiEditor.Models.Tools.Tools
 {
     public class PenTool : Tool
     {

PixiEditorDotNetCore3/Models/Tools/Tools/RectangleTool.cs

@@ -1,9 +1,9 @@
-using PixiEditorDotNetCore3.Models.Layers;
-using PixiEditorDotNetCore3.Models.Position;
+using PixiEditor.Models.Layers;
+using PixiEditor.Models.Position;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
-namespace PixiEditorDotNetCore3.Models.Tools.Tools
+namespace PixiEditor.Models.Tools.Tools
 {
     public class RectangleTool : ShapeTool
     {
@@ -11,7 +11,7 @@ namespace PixiEditorDotNetCore3.Models.Tools.Tools
 
         public override BitmapPixelChanges Use(Layer layer, Coordinates[] coordinates, Color color, int toolSize)
         {
-            CreateRectangle(layer,coordinates[0] ,color,toolSize);
+            CreateRectangle(layer,coordinates[0], color, toolSize);
             return new BitmapPixelChanges();
         }
 

PixiEditorDotNetCore3/Models/Tools/ToolsManager.cs

@@ -9,10 +9,10 @@ using PixiEditor.ViewModels;
 using System.Timers;
 using System.Windows.Threading;
 using System.Threading;
-using PixiEditorDotNetCore3.Models.Layers;
-using PixiEditorDotNetCore3.Models.Position;
+using PixiEditor.Models.Layers;
+using PixiEditor.Models.Position;
 
-namespace PixiEditorDotNetCore3.Models.Tools
+namespace PixiEditor.Models.Tools
 {
     public class ToolsManager
     {

PixiEditorDotNetCore3/ViewModels/NewFileMenuViewModel.cs

@@ -1,5 +1,5 @@
 using PixiEditor.Helpers;
-using PixiEditorDotNetCore3.Models;
+using PixiEditor.Models;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;

PixiEditorDotNetCore3/ViewModels/ViewModelMain.cs

@@ -1,6 +1,6 @@
 using PixiEditor.Helpers;
-using PixiEditorDotNetCore3.Models.Enums;
-using PixiEditorDotNetCore3.Models.Tools;
+using PixiEditor.Models.Enums;
+using PixiEditor.Models.Tools;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -11,13 +11,13 @@ using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using PixiTools = PixiEditorDotNetCore3.Models.Tools.Tools;
+using PixiTools = PixiEditor.Models.Tools.Tools;
 using PixiEditor.Models.Controllers;
-using PixiEditorDotNetCore3.Models.Dialogs;
-using PixiEditorDotNetCore3.Models.Images;
-using PixiEditorDotNetCore3.Models.IO;
-using PixiEditorDotNetCore3.Models.Layers;
-using PixiEditorDotNetCore3.Models.Position;
+using PixiEditor.Models.Dialogs;
+using PixiEditor.Models.Images;
+using PixiEditor.Models.IO;
+using PixiEditor.Models.Layers;
+using PixiEditor.Models.Position;
 using PixiEditor.Models.Enums;
 
 namespace PixiEditor.ViewModels
@@ -27,7 +27,8 @@ namespace PixiEditor.ViewModels
 
         public RelayCommand SelectToolCommand { get; set; } //Command that handles tool switching 
         public RelayCommand GenerateDrawAreaCommand { get; set; } //Command that generates draw area
-        public RelayCommand MouseMoveOrClickCommand { get; set; } //Command that is used to draw
+        public RelayCommand MouseMoveCommand { get; set; } //Command that is used to draw
+        public RelayCommand MouseDownCommand { get; set; }
         public RelayCommand SaveFileCommand { get; set; } //Command that is used to save file
         public RelayCommand UndoCommand { get; set; }
         public RelayCommand RedoCommand { get; set; }
@@ -131,9 +132,11 @@ namespace PixiEditor.ViewModels
             PixiFilesManager.InitializeTempDirectories();
             BitmapUtility = new BitmapOperationsUtility();
             BitmapUtility.BitmapChanged += BitmapUtility_BitmapChanged;
+            BitmapUtility.LayersChanged += BitmapUtility_LayersChanged;
             SelectToolCommand = new RelayCommand(RecognizeTool);
             GenerateDrawAreaCommand = new RelayCommand(GenerateDrawArea);
-            MouseMoveOrClickCommand = new RelayCommand(MouseMoveOrClick);
+            MouseMoveCommand = new RelayCommand(MouseMove);
+            MouseDownCommand = new RelayCommand(MouseDown);
             SaveFileCommand = new RelayCommand(SaveFile, CanSave);
             UndoCommand = new RelayCommand(Undo, CanUndo);
             RedoCommand = new RelayCommand(Redo, CanRedo);
@@ -150,9 +153,9 @@ namespace PixiEditor.ViewModels
             ToolSize = 1;
         }
 
-        public void SetActiveLayer(object parameter)
+        private void BitmapUtility_LayersChanged(object sender, LayersChangedEventArgs e)
         {
-            BitmapUtility.SetActiveLayer((int)parameter);
+            RefreshImage();
         }
 
         private void BitmapUtility_BitmapChanged(object sender, BitmapChangedEventArgs e)
@@ -160,6 +163,12 @@ namespace PixiEditor.ViewModels
             RefreshImage();
         }
 
+        public void SetActiveLayer(object parameter)
+        {
+            BitmapUtility.SetActiveLayer((int)parameter);
+            ActiveImage.Source = BitmapUtility.GetCombinedBitmaps();
+        }
+
         #region Undo/Redo
         /// <summary>
         /// Undo last action
@@ -221,31 +230,30 @@ namespace PixiEditor.ViewModels
             UndoManager.StopRecording();
             BitmapUtility.MouseController.StopRecordingMouseMovementChanges();
             primaryToolSet.StopExectuingTool();
+        }
+
+        private void MouseDown(object parameter)
+        {
+            if (!BitmapUtility.MouseController.IsRecordingChanges)
+            {
+                BitmapUtility.MouseController.StartRecordingMouseMovementChanges();
+                BitmapUtility.MouseController.RecordMouseMovementChanges(MousePositionConverter.CurrentCoordinates);
+            }
         }
 
         /// <summary>
         /// Method connected with command, it executes tool "activity"
         /// </summary>
         /// <param name="parameter"></param>
-        private void MouseMoveOrClick(object parameter)
+        private void MouseMove(object parameter)
         {
             Coordinates cords = new Coordinates((int)MouseXOnCanvas, (int)MouseYOnCanvas);
             MousePositionConverter.CurrentCoordinates = cords;
 
-            if ((Models.Enums.MouseAction)parameter == Models.Enums.MouseAction.MouseDown)
-            {
-                if (!BitmapUtility.MouseController.IsRecordingChanges)
-                {
-                    BitmapUtility.MouseController.StartRecordingMouseMovementChanges();
-                }
-            }
-            if((Models.Enums.MouseAction)parameter == Models.Enums.MouseAction.Move)
-            {
                 if (BitmapUtility.MouseController.IsRecordingChanges)
                 {
                     BitmapUtility.MouseController.RecordMouseMovementChanges(cords);
                 }
-            }
         }
 
 
@@ -330,12 +338,15 @@ namespace PixiEditor.ViewModels
 
         public void RefreshImage()
         {
-            ActiveImage.Source = BitmapUtility.ActiveLayer.LayerBitmap;
+            if (ActiveImage != null)
+            {
+                ActiveImage.Source = BitmapUtility.ActiveLayer.LayerBitmap;
+            }
         }
 
         public void NewLayer(object parameter)
         {
-            BitmapUtility.AddNewLayer("New Layer", BitmapUtility.Layers[0].Width, BitmapUtility.Layers[0].Height);
+            BitmapUtility.AddNewLayer("New Layer", BitmapUtility.Layers[0].Width, BitmapUtility.Layers[0].Height);         
         }
 
         public bool CanCreateNewLayer(object parameter)

PixiEditorDotNetCore3/Views/MainDrawingPanel.xaml.cs

@@ -1,4 +1,4 @@
-using PixiEditorDotNetCore3.Models;
+using PixiEditor.Models;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;

PixiEditorDotNetCore3/Views/MainWindow.xaml

@@ -115,13 +115,13 @@
                         <Canvas Width="{Binding BitmapUtility.ActiveLayer.Width}" Height="{Binding BitmapUtility.ActiveLayer.Height}" VerticalAlignment="Center" HorizontalAlignment="Center">
                             <i:Interaction.Triggers>
                                 <i:EventTrigger EventName="MouseMove">
-                                    <i:InvokeCommandAction Command="{Binding MouseMoveOrClickCommand}" CommandParameter="{x:Static enums:MouseAction.Move}"/>
+                                    <i:InvokeCommandAction Command="{Binding MouseMoveCommand}"/>
                                 </i:EventTrigger>
                                 <i:EventTrigger EventName="MouseDown">
-                                    <i:InvokeCommandAction Command="{Binding MouseMoveOrClickCommand}" CommandParameter="{x:Static enums:MouseAction.MouseDown}"/>
+                                    <i:InvokeCommandAction Command="{Binding MouseDownCommand}"/>
                                 </i:EventTrigger>
                                 <i:EventTrigger EventName="MouseUp">
-                                    <i:InvokeCommandAction Command="{Binding MouseUpCommand}" CommandParameter="{x:Static enums:MouseAction.MouseUp}"/>
+                                    <i:InvokeCommandAction Command="{Binding MouseUpCommand}"/>
                                 </i:EventTrigger>
                             </i:Interaction.Triggers>
                             <i:Interaction.Behaviors>