|
@@ -122,10 +122,14 @@ namespace PixiEditor.ViewModels.SubViewModels.Main
|
|
|
{
|
|
|
if (setOn)
|
|
|
{
|
|
|
- if(!(Owner.ToolsSubViewModel.ActiveTool is MoveViewportTool))
|
|
|
+ var moveViewportToolIsActive = Owner.ToolsSubViewModel.ActiveTool is MoveViewportTool;
|
|
|
+ if (!moveViewportToolIsActive)
|
|
|
+ {
|
|
|
Owner.ToolsSubViewModel.SetActiveTool<MoveViewportTool>();
|
|
|
+ Owner.ToolsSubViewModel.MoveToolIsTransient = true;
|
|
|
+ }
|
|
|
}
|
|
|
- else if (Owner.ToolsSubViewModel.LastActionTool != null)
|
|
|
+ else if (Owner.ToolsSubViewModel.LastActionTool != null && Owner.ToolsSubViewModel.MoveToolIsTransient)
|
|
|
{
|
|
|
Owner.ToolsSubViewModel.SetActiveTool(Owner.ToolsSubViewModel.LastActionTool);
|
|
|
}
|