Преглед на файлове

Fixed app freeze on resize

Krzysztof Krysiński преди 2 години
родител
ревизия
07bae0ab4a
променени са 2 файла, в които са добавени 23 реда и са изтрити 24 реда
  1. 21 21
      src/PixiEditor.AvaloniaUI/Views/Main/Viewport.axaml
  2. 2 3
      src/PixiEditor.Zoombox/Zoombox.axaml.cs

+ 21 - 21
src/PixiEditor.AvaloniaUI/Views/Main/Viewport.axaml

@@ -28,7 +28,7 @@
     x:Name="vpUc"
     d:DesignHeight="450"
     d:DesignWidth="800">
-    <Grid 
+    <Grid
         x:Name="viewportGrid"
         PointerPressed="Image_MouseDown">
         <Interaction.Behaviors>
@@ -184,18 +184,18 @@
                                             <DataTrigger.EnterActions>
                                                 <BeginStoryboard>
                                                     <Storyboard>
-                                                        <DoubleAnimation 
-                                                            Storyboard.TargetProperty="(Button.Opacity)" 
-                                                            From="1" To="{x:Static subviews:ReferenceLayerViewModel.TopMostOpacity}" Duration="0:0:0.1" /> 
+                                                        <DoubleAnimation
+                                                            Storyboard.TargetProperty="(Button.Opacity)"
+                                                            From="1" To="{x:Static subviews:ReferenceLayerViewModel.TopMostOpacity}" Duration="0:0:0.1" />
                                                     </Storyboard>
                                                 </BeginStoryboard>
                                             </DataTrigger.EnterActions>
                                             <DataTrigger.ExitActions>
                                                 <BeginStoryboard>
                                                     <Storyboard>
-                                                        <DoubleAnimation 
-                                                            Storyboard.TargetProperty="(Button.Opacity)" 
-                                                            From="{x:Static subviews:ReferenceLayerViewModel.TopMostOpacity}" To="1" Duration="0:0:0.1" /> 
+                                                        <DoubleAnimation
+                                                            Storyboard.TargetProperty="(Button.Opacity)"
+                                                            From="{x:Static subviews:ReferenceLayerViewModel.TopMostOpacity}" To="1" Duration="0:0:0.1" />
                                                     </Storyboard>
                                                 </BeginStoryboard>
                                             </DataTrigger.ExitActions>
@@ -212,18 +212,18 @@
                                         <DataTrigger.EnterActions>
                                             <BeginStoryboard>
                                                 <Storyboard>
-                                                    <DoubleAnimation 
-                                                        Storyboard.TargetProperty="(Button.Opacity)" 
-                                                        From="1" To="0" Duration="0:0:0.1" /> 
+                                                    <DoubleAnimation
+                                                        Storyboard.TargetProperty="(Button.Opacity)"
+                                                        From="1" To="0" Duration="0:0:0.1" />
                                                 </Storyboard>
                                             </BeginStoryboard>
                                         </DataTrigger.EnterActions>
                                         <DataTrigger.ExitActions>
                                             <BeginStoryboard>
                                                 <Storyboard>
-                                                    <DoubleAnimation 
-                                                        Storyboard.TargetProperty="(Button.Opacity)" 
-                                                        From="0" To="1" Duration="0:0:0.1" /> 
+                                                    <DoubleAnimation
+                                                        Storyboard.TargetProperty="(Button.Opacity)"
+                                                        From="0" To="1" Duration="0:0:0.1" />
                                                 </Storyboard>
                                             </BeginStoryboard>
                                         </DataTrigger.ExitActions>
@@ -247,18 +247,18 @@
                                         <DataTrigger.EnterActions>
                                             <BeginStoryboard>
                                                 <Storyboard>
-                                                    <DoubleAnimation 
-                                                        Storyboard.TargetProperty="(Button.Opacity)" 
-                                                        From="1" To="0" Duration="0:0:0.1" /> 
+                                                    <DoubleAnimation
+                                                        Storyboard.TargetProperty="(Button.Opacity)"
+                                                        From="1" To="0" Duration="0:0:0.1" />
                                                 </Storyboard>
                                             </BeginStoryboard>
                                         </DataTrigger.EnterActions>
                                         <DataTrigger.ExitActions>
                                             <BeginStoryboard>
                                                 <Storyboard>
-                                                    <DoubleAnimation 
-                                                        Storyboard.TargetProperty="(Button.Opacity)" 
-                                                        From="0" To="1" Duration="0:0:0.1" /> 
+                                                    <DoubleAnimation
+                                                        Storyboard.TargetProperty="(Button.Opacity)"
+                                                        From="0" To="1" Duration="0:0:0.1" />
                                                 </Storyboard>
                                             </BeginStoryboard>
                                         </DataTrigger.ExitActions>
@@ -323,8 +323,8 @@
                             ZoomboxScale="{Binding Zoombox.Scale}"
                             FlowDirection="LeftToRight"/>
                     </Grid>
-                    <Grid IsHitTestVisible="False" 
-                        ShowGridLines="True" Width="{Binding Document.Width}" Height="{Binding Document.Height}" Panel.ZIndex="10" 
+                    <Grid IsHitTestVisible="False"
+                        ShowGridLines="True" Width="{Binding Document.Width}" Height="{Binding Document.Height}" Panel.ZIndex="10"
                         IsVisible="{Binding GridLinesVisible, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:Viewport}}">
                         <Grid.Resources>
                             <converters:ThresholdVisibilityConverter Threshold="10" x:Key="ThresholdVisibilityConverter"/>

+ 2 - 3
src/PixiEditor.Zoombox/Zoombox.axaml.cs

@@ -465,13 +465,12 @@ public partial class Zoombox : UserControl, INotifyPropertyChanged
 
     private void OnMainCanvasSizeChanged(object sender, SizeChangedEventArgs e)
     {
-        OnPropertyChange(this);
-        RaiseViewportEvent();
+        //TODO: This causes app freeze on window resize
+        //OnPropertyChange(this);
     }
 
     private void OnGridSizeChanged(object sender, SizeChangedEventArgs args)
     {
         OnPropertyChange(this);
-        RaiseViewportEvent();
     }
 }