Browse Source

Merge pull request #470 from PixiEditor/i-did-things-here

Fixes and improvements
Krzysztof Krysiński 2 years ago
parent
commit
4d88457d1a

+ 5 - 3
src/PixiEditor/Models/DocumentModels/UpdateableChangeExecutors/TransformSelectedAreaExecutor.cs

@@ -54,13 +54,15 @@ internal class TransformSelectedAreaExecutor : UpdateableChangeExecutor
 
 
     public override void OnTransformApplied()
     public override void OnTransformApplied()
     {
     {
-        if (Type == ExecutorType.ToolLinked)
-            return;
-
         internals!.ActionAccumulator.AddActions(new EndTransformSelectedArea_Action());
         internals!.ActionAccumulator.AddActions(new EndTransformSelectedArea_Action());
         internals!.ActionAccumulator.AddFinishedActions();
         internals!.ActionAccumulator.AddFinishedActions();
         document!.TransformViewModel.HideTransform();
         document!.TransformViewModel.HideTransform();
         onEnded!.Invoke(this);
         onEnded!.Invoke(this);
+
+        if (Type == ExecutorType.ToolLinked)
+        {
+            ViewModelMain.Current!.ToolsSubViewModel.RestorePreviousTool();
+        }
     }
     }
 
 
     public override void ForceStop()
     public override void ForceStop()

+ 22 - 0
src/PixiEditor/Views/UserControls/Viewport.xaml

@@ -294,6 +294,28 @@
                             </Rectangle.Fill>
                             </Rectangle.Fill>
                         </Rectangle>
                         </Rectangle>
                     </Grid>
                     </Grid>
+                    <Rectangle Stroke="{StaticResource AccentColor}" Opacity=".8" Panel.ZIndex="2" Visibility="{Binding Document.ReferenceLayerViewModel.IsVisibleBindable, Converter={converters:BoolToHiddenVisibilityConverter}}">
+                        <Rectangle.StrokeThickness>
+                            <Binding Converter="{converters:ReciprocalConverter}">
+                                <Binding.Path>Zoombox.Scale</Binding.Path>
+                                <Binding.ConverterParameter>
+                                    <sys:Double>
+                                        3
+                                    </sys:Double>
+                                </Binding.ConverterParameter>
+                            </Binding>
+                        </Rectangle.StrokeThickness>
+                        <Rectangle.Margin>
+                            <Binding Converter="{converters:ReciprocalConverter}">
+                                <Binding.Path>Zoombox.Scale</Binding.Path>
+                                <Binding.ConverterParameter>
+                                    <sys:Double>
+                                        -3
+                                    </sys:Double>
+                                </Binding.ConverterParameter>
+                            </Binding>
+                        </Rectangle.Margin>
+                    </Rectangle>
                 </Grid>
                 </Grid>
             </Border>
             </Border>
         </zoombox:Zoombox>
         </zoombox:Zoombox>