Fix #271

PixiEditor · Dec 11, 2021 · aefa415 · aefa415
1 parent 965b15c
commit aefa415
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/PixiEditor/Models/Controllers/BitmapManager.cs b/PixiEditor/Models/Controllers/BitmapManager.cs
@@ -182,12 +182,13 @@ public void UpdateHighlightIfNecessary(bool forceHide = false)
         {
             if (activeSession != null)
                 return;
+
             HighlightPixels(forceHide ? new(-1, -1) : ToolSessionController.LastPixelPosition);
         }
 
         private void HighlightPixels(Coordinates newPosition)
         {
-            if (ActiveDocument == null || ActiveDocument.Layers.Count == 0 || _tools.ActiveTool.HideHighlight)
+            if (ActiveDocument == null || ActiveDocument.Layers.Count == 0)
             {
                 return;
             }
@@ -196,7 +197,8 @@ private void HighlightPixels(Coordinates newPosition)
 
             if (newPosition.X > ActiveDocument.Width
                 || newPosition.Y > ActiveDocument.Height
-                || newPosition.X < 0 || newPosition.Y < 0)
+                || newPosition.X < 0 || newPosition.Y < 0
+                || _tools.ActiveTool.HideHighlight)
             {
                 previewLayer.Reset();
                 previewLayerSize = -1;

diff --git a/PixiEditor/ViewModels/SubViewModels/Main/ToolsViewModel.cs b/PixiEditor/ViewModels/SubViewModels/Main/ToolsViewModel.cs
@@ -99,6 +99,7 @@ public void SetActiveTool(Tool tool)
             Owner.BitmapManager.UpdateActionDisplay(LastActionTool);
             //update new tool
             Owner.BitmapManager.UpdateActionDisplay(ActiveTool);
+            Owner.BitmapManager.UpdateHighlightIfNecessary();
 
             tool.IsActive = true;
             SetToolCursor(tool.GetType());