Fixed bug when opening a file by double clicking or through the open …

…file dialog displayed the file with unsaved changes.
XamDR · Jul 21, 2020 · 72df716 · 72df716
1 parent e562181
commit 72df716
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/ModernNotepad/App.xaml.cs b/ModernNotepad/App.xaml.cs
@@ -20,7 +20,7 @@ protected override void OnStartup(StartupEventArgs e)
         {
             base.OnStartup(e);            
             var mainWindow = MainViewModel.WindowService.CreateMainView(MainViewModel, typeof(MainViewModel));
-            MainViewModel.TextEditor.TextArea = mainWindow.TextArea;
+            MainViewModel.TextEditor.TextArea = mainWindow.TextArea;            
 
             if (!Directory.Exists(MainViewModel.SettingsManager.SettingsDirectoryPath))
             {
@@ -33,10 +33,11 @@ protected override void OnStartup(StartupEventArgs e)
 
             if (e.Args.Length > 0)
             {
+                MainViewModel.TextEditor.SavedAsFile = true;
                 MainViewModel.Title = Path.GetFileName(e.Args[0]);
                 MainViewModel.FilePath = Path.GetFullPath(e.Args[0]);
                 MainViewModel.TextEditor.TextArea.Text = File.ReadAllText(e.Args[0], Encoding.Default);
-                MainViewModel.TextEditor.SavedAsFile = true;
+                //MainViewModel.TextEditor.SavedAsFile = true;
                 MainViewModel.SaveFileService.FileName = e.Args[0];
             }
         }

diff --git a/ModernNotepad/Behaviors/TextChangedBehavior.cs b/ModernNotepad/Behaviors/TextChangedBehavior.cs
@@ -22,13 +22,14 @@ protected override void OnDetaching()
 
         private void OnTextChanged(object sender, TextChangedEventArgs e)
         {   
-            var viewModel = Application.Current.MainWindow.DataContext as MainViewModel;            
-            var textArea = viewModel.TextEditor.TextArea;
+            var viewModel = Application.Current.MainWindow.DataContext as MainViewModel;
+            var editor = viewModel.TextEditor;
+            var textArea = editor.TextArea;
 
-            if (e.Changes.FirstOrDefault().AddedLength > 0 ||
-                e.Changes.FirstOrDefault().AddedLength != textArea.Text.Length || 
-                e.Changes.FirstOrDefault().RemovedLength > 0) // BUG HERE
-            {                
+            if ((!editor.SavedAsFile && e.Changes.FirstOrDefault().AddedLength > 0) ||
+                e.Changes.FirstOrDefault().AddedLength != textArea.Text.Length ||
+                e.Changes.FirstOrDefault().RemovedLength > 0)
+            {
                 viewModel.Title = $"*{viewModel.Title.Replace("*", "")}";
                 viewModel.TextEditor.UnsavedChanges = true;
             }

diff --git a/ModernNotepad/Views/MainWindow.xaml b/ModernNotepad/Views/MainWindow.xaml
@@ -138,10 +138,10 @@
                     </i:Interaction.Behaviors>
                 </Popup>
 
-                <cc:TextArea x:Name="textArea" Grid.Row="1" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"
+                <cc:TextArea x:Name="textArea" x:FieldModifier="private" Grid.Row="1" 
+                             HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"
                              IsInactiveSelectionHighlightEnabled="True" Padding="10,5,20,6" FontFamily="Consolas" FontSize="14"
-                             Style="{StaticResource TextAreaStyle}"
-                             SpellCheck.IsEnabled="{Binding SettingsViewModel.IsSpellCheckingEnabled}"
+                             Style="{StaticResource TextAreaStyle}" SpellCheck.IsEnabled="{Binding SettingsViewModel.IsSpellCheckingEnabled}"
                              TextWrapping="{Binding SettingsViewModel.IsWordWrapEnabled, Converter={StaticResource BooleanToTextWrapping}}">
                     <i:Interaction.Behaviors>
                         <behaviors:PasteContentBehavior/>
@@ -192,7 +192,7 @@
                     <i:Interaction.Behaviors>
                         <behaviors:ZoomBehavior ZoomScale="{Binding Scale, Mode=TwoWay}"/>
                     </i:Interaction.Behaviors>
-                    <FlowDocumentPageViewer Name="pageViewer" Foreground="Black" ContextMenu="{x:Null}">                        
+                    <FlowDocumentPageViewer Name="pageViewer" x:FieldModifier="private" Foreground="Black" ContextMenu="{x:Null}">                        
                         <FlowDocument ColumnGap="0" ColumnWidth="{x:Static util:PrintDialogWrapper.PrintableAreaWidth}"
                                       PageHeight="{x:Static util:PrintDialogWrapper.PrintableAreaHeight}"
                                       PageWidth="{x:Static util:PrintDialogWrapper.PrintableAreaWidth}">