Browse Source

Fixed tool misfire on overlays

flabbet 8 months ago
parent
commit
d185c5a933

+ 1 - 0
src/PixiEditor/Views/Main/Tools/Toolbar.axaml

@@ -12,6 +12,7 @@
             BorderBrush="{DynamicResource ThemeBorderMidBrush}"
             BorderThickness="{DynamicResource ThemeBorderThickness}"
             Cursor="Arrow"
+            IsHitTestVisible="True"
             Padding="5"
             Height="40"
             HorizontalAlignment="Left"

+ 1 - 1
src/PixiEditor/Views/Main/ViewportControls/Viewport.axaml

@@ -162,7 +162,7 @@
                     ui:Translator.Key="{Binding Source={viewModels:MainVM}, Path=ToolsSubViewModel.ActiveToolSet.Name}"
                     VerticalAlignment="Center" />
             </Border>
-            <tools:ToolsPicker Grid.Row="2" 
+            <tools:ToolsPicker Grid.Row="2" IsHitTestVisible="True"
                 HorizontalAlignment="Left"
                 ToolSet="{Binding Source={viewModels:MainVM}, Path=ToolsSubViewModel.ActiveToolSet, Mode=TwoWay}"
                                ToolSets="{Binding Source={viewModels:MainVM}, Path=ToolsSubViewModel.AllToolSets, Mode=OneWay}"

+ 1 - 1
src/PixiEditor/Views/Main/ViewportControls/Viewport.axaml.cs

@@ -394,7 +394,7 @@ internal partial class Viewport : UserControl, INotifyPropertyChanged
 
     private void Image_MouseDown(object? sender, PointerPressedEventArgs e)
     {
-        if (Document is null)
+        if (Document is null || e.Source != Scene)
             return;
 
         bool isMiddle = e.GetCurrentPoint(this).Properties.IsMiddleButtonPressed;