fix: fix ValueChanged and ResourceChanged listen

czastack · Apr 12, 2024 · e2cee26 · e2cee26
1 parent 0f11cb7
commit e2cee26
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 15 deletions.
diff --git a/RszTool.App/Views/RszPfbFileView.xaml b/RszTool.App/Views/RszPfbFileView.xaml
@@ -52,7 +52,8 @@
         </ResourceDictionary>
     </UserControl.Resources>
 
-    <Grid>
+    <Grid local:FieldValueInput.ValueChanged="OnValueChanged"
+          local:FieldValueInput.ResourceChanged="OnResourceChanged">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*"/>
         </Grid.ColumnDefinitions>
@@ -61,9 +62,7 @@
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto" MaxHeight="{Binding ActualHeight, RelativeSource={RelativeSource FindAncestor, AncestorType=ContentPresenter}}" />
         </Grid.RowDefinitions>
-        <local:RszFileView Grid.Row="0"
-                           local:FieldValueInput.ValueChanged="OnValueChanged"
-                           local:FieldValueInput.ResourceChanged="OnResourceChanged" />
+        <local:RszFileView Grid.Row="0" />
         <GridSplitter Grid.Row="1" Height="3" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="0,5,0,0" />
         <TabControl Grid.Row="2">
             <TabItem Header="{res:Text FindInstances}">

diff --git a/RszTool.App/Views/RszScnFileView.xaml b/RszTool.App/Views/RszScnFileView.xaml
@@ -81,7 +81,8 @@
         </ResourceDictionary>
     </UserControl.Resources>
 
-    <Grid>
+    <Grid local:FieldValueInput.ValueChanged="OnValueChanged"
+          local:FieldValueInput.ResourceChanged="OnResourceChanged">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*"/>
         </Grid.ColumnDefinitions>
@@ -90,9 +91,7 @@
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto" MaxHeight="{Binding ActualHeight, RelativeSource={RelativeSource FindAncestor, AncestorType=ContentPresenter}}" />
         </Grid.RowDefinitions>
-        <local:RszFileView Grid.Row="0"
-                           local:FieldValueInput.ValueChanged="OnValueChanged"
-                           local:FieldValueInput.ResourceChanged="OnResourceChanged" />
+        <local:RszFileView Grid.Row="0" />
         <GridSplitter Grid.Row="1" Height="3" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="0,5,0,0" />
         <TabControl Grid.Row="2">
             <TabItem Header="{res:Text FindInstances}">

diff --git a/RszTool.App/Views/RszScnFileView.xaml.cs b/RszTool.App/Views/RszScnFileView.xaml.cs
@@ -27,6 +27,7 @@ private void OnResourceChanged(object sender, RoutedEventArgs e)
             if (DataContext is ScnFileViewModel viewModel)
             {
                 viewModel.ResourceChanged = true;
+                Console.WriteLine("OnResourceChanged");
             }
         }
     }

diff --git a/RszTool.App/Views/RszUserFileView.xaml b/RszTool.App/Views/RszUserFileView.xaml
@@ -14,7 +14,8 @@
         <ResourceDictionary Source="TreeViewTemplate.xaml" />
     </UserControl.Resources>
 
-    <Grid>
+    <Grid local:FieldValueInput.ValueChanged="OnValueChanged"
+          local:FieldValueInput.ResourceChanged="OnResourceChanged">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*"/>
         </Grid.ColumnDefinitions>
@@ -23,9 +24,7 @@
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto" MaxHeight="{Binding ActualHeight, RelativeSource={RelativeSource FindAncestor, AncestorType=ContentPresenter}}" />
         </Grid.RowDefinitions>
-        <local:RszFileView Grid.Row="0"
-                           local:FieldValueInput.ValueChanged="OnValueChanged"
-                           local:FieldValueInput.ResourceChanged="OnResourceChanged" />
+        <local:RszFileView Grid.Row="0" />
         <GridSplitter Grid.Row="1" Height="3" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="0,5,0,0" />
         <local:SearchInstanceView Grid.Row="2" Margin="5" />
     </Grid>

diff --git a/RszTool/RszFile/PfbFile.cs b/RszTool/RszFile/PfbFile.cs
@@ -233,9 +233,10 @@ protected override bool DoWrite()
             {
                 RebuildInfoTable();
             }
-            if (ResourceChanged)
+            else if (ResourceChanged)
             {
                 RszUtils.SyncResourceFromRsz(ResourceInfoList, RSZ!);
+                ResourceChanged = false;
             }
             FileHandler handler = FileHandler;
             handler.Clear();

diff --git a/RszTool/RszFile/ScnFile.cs b/RszTool/RszFile/ScnFile.cs
@@ -349,9 +349,10 @@ protected override bool DoWrite()
             {
                 RebuildInfoTable();
             }
-            if (ResourceChanged)
+            else if (ResourceChanged)
             {
                 RszUtils.SyncResourceFromRsz(ResourceInfoList, RSZ!);
+                ResourceChanged = false;
             }
 
             FileHandler handler = FileHandler;

diff --git a/RszTool/RszFile/UserFile.cs b/RszTool/RszFile/UserFile.cs
@@ -70,9 +70,10 @@ protected override bool DoWrite()
             {
                 RebuildInfoTable();
             }
-            if (ResourceChanged)
+            else if (ResourceChanged)
             {
                 RszUtils.SyncResourceFromRsz(ResourceInfoList, RSZ!);
+                ResourceChanged = false;
             }
             FileHandler handler = FileHandler;
             handler.Clear();
-Original file line number
+Diff line change
@@ Expand Up @@
                 if (DataContext is ScnFileViewModel viewModel)
                 {
                     viewModel.ResourceChanged = true;
+                    Console.WriteLine("OnResourceChanged");
                 }
             }
         }
@@ Expand Down @@