编辑体验优化

Author: HelloWRC

StickyHomeworks/Behaviors/RichTextBoxBindingBehavior.cs

@@ -62,20 +62,7 @@ public static void SetDocumentXaml(DependencyObject obj, string value)
                 // Parse the XAML to a document (or use XamlReader.Parse())
 
                 var documentXaml = GetDocumentXaml(b);
-                try
-                {
-                    var stream = new MemoryStream(Encoding.UTF8.GetBytes(documentXaml));
-                    var doc = (FlowDocument)XamlReader.Load(stream);
-                    // Set the document
-                    richTextBox.Document = doc;
-                }
-                catch (Exception)
-                {
-                    richTextBox.Document = new FlowDocument();
-                    var para = new Paragraph();
-                    para.Inlines.Add(documentXaml);
-                    richTextBox.Document.Blocks.Add(para);
-                }
+                richTextBox.Document = RichTextBoxHelper.ConvertDocument(documentXaml);
                 richTextBox.Document.IsOptimalParagraphEnabled = true;
 
                 // When the document changes update the source

StickyHomeworks/Controls/HomeworkControl.xaml.cs

@@ -14,6 +14,7 @@
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 using ElysiaFramework;
+using Stfu.Linq;
 using StickyHomeworks.Models;
 using StickyHomeworks.Views;
 
@@ -72,19 +73,26 @@ private void IsEditingChanged(bool value)
         if (IsSelected && value)
         {
             Debug.WriteLine("RelatedRichTextBox updated because IsEditing changed");
-            AppEx.GetService<HomeworkEditWindow>().RelatedRichTextBox = RichTextBox;
-            RichTextBox.Focus();
+            EnterEdit();
         }
     }
 
+    private async void EnterEdit()
+    {
+        AppEx.GetService<HomeworkEditWindow>().RelatedRichTextBox = RichTextBox;
+        await System.Windows.Threading.Dispatcher.Yield();
+        RichTextBox.Focus();
+        //RichTextBox.Selection.Select(new TextPointer());
+        RichTextBox.CaretPosition = RichTextBox.CaretPosition.DocumentEnd;
+    }
+
     private void IsSelectedChanged(bool value)
     {
         Debug.WriteLine($"IsSelected changed! {value} {IsEditing}");
         if (value && IsEditing)
         {
             Debug.WriteLine("RelatedRichTextBox updated because IsSelected changed");
-            AppEx.GetService<HomeworkEditWindow>().RelatedRichTextBox = RichTextBox;
-            RichTextBox.Focus();
+            EnterEdit();
         }
     }
 }

StickyHomeworks/MainWindow.xaml.cs

@@ -46,15 +46,28 @@ public MainWindow(ProfileService profileService,
         Automation.AddAutomationFocusChangedEventHandler(OnFocusChangedHandler);
         InitializeComponent();
         ViewModel.PropertyChanged += ViewModelOnPropertyChanged;
+        ViewModel.PropertyChanging += ViewModelOnPropertyChanging;
         DataContext = this;
     }
 
+    private void ViewModelOnPropertyChanging(object? sender, PropertyChangingEventArgs e)
+    {
+        if (e.PropertyName == nameof(ViewModel.SelectedHomework))
+        {
+            ExitEditingMode(true);
+        }
+    }
+
     private void ViewModelOnPropertyChanged(object? sender, PropertyChangedEventArgs e)
     {
         if (e.PropertyName == nameof(ViewModel.SelectedListBoxItem))
         {
             RepositionEditingWindow();
         }
+        if (e.PropertyName == nameof(ViewModel.SelectedHomework))
+        {
+            ExitEditingMode(false);
+        }
     }
 
     private void OnFocusChangedHandler(object sender, AutomationFocusChangedEventArgs e)
@@ -83,10 +96,16 @@ private void OnFocusChangedHandler(object sender, AutomationFocusChangedEventArg
 
     private void ExitEditingMode(bool hard=true)
     {
+        if (ViewModel.IsCreatingMode)
+        {
+            ViewModel.IsCreatingMode = false;
+            return;
+        }
         if (hard)
             MainListView.SelectedIndex = -1;
         ViewModel.IsDrawerOpened = false;
         AppEx.GetService<HomeworkEditWindow>().TryClose();
+        AppEx.GetService<ProfileService>().SaveProfile();
     }
 
     private void SetPos()
@@ -162,7 +181,7 @@ private void ButtonCreateHomework_OnClick(object sender, RoutedEventArgs e)
         ViewModel.IsUpdatingHomeworkSubject = true;
         OnHomeworkEditorUpdated?.Invoke(this ,EventArgs.Empty);
         var lastSubject = ViewModel.EditingHomework.Subject;
-        //ViewModel.IsCreatingMode = true;
+        ViewModel.IsCreatingMode = true;
         ViewModel.IsDrawerOpened = true;
         var o = new Homework()
         {
@@ -365,6 +384,10 @@ private async void ButtonExport_OnClick(object sender, RoutedEventArgs e)
         }
 
         var file = dialog.FileName!;
+        var fd = new FlowDocument()
+        {
+            IsOptimalParagraphEnabled = true
+        };
         try
         {
             await Task.Run(() =>
@@ -420,6 +443,6 @@ private void ButtonMore_Click(object sender, RoutedEventArgs e)
 
     private void MainListView_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
     {
-        ExitEditingMode(false);
+        //ExitEditingMode(false);
     }
 }

StickyHomeworks/RichTextBoxHelper.cs

@@ -8,7 +8,25 @@
 
 namespace StickyHomeworks;
 
-public class RichTextBoxHelper : DependencyObject
+public static class RichTextBoxHelper
 {
-    
+    public static FlowDocument ConvertDocument(string xaml)
+    {
+        try
+        {
+            var stream = new MemoryStream(Encoding.UTF8.GetBytes(xaml));
+            var doc = (FlowDocument)XamlReader.Load(stream);
+            doc.IsOptimalParagraphEnabled = true;
+            return doc;
+        }
+        catch (Exception)
+        {
+            var doc = new FlowDocument();
+            var para = new Paragraph();
+            doc.IsOptimalParagraphEnabled = true;
+            para.Inlines.Add(xaml);
+            doc.Blocks.Add(para);
+            return doc;
+        }
+    }
 }

StickyHomeworks/Views/HomeworkEditWindow.xaml.cs

@@ -14,6 +14,7 @@
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
+using ElysiaFramework;
 using StickyHomeworks.Services;
 using StickyHomeworks.ViewModels;
 
@@ -205,6 +206,7 @@ private void ButtonFontSizeIncrease_OnClick(object sender, RoutedEventArgs e)
     private void ButtonEditingDone_OnClick(object sender, RoutedEventArgs e)
     {
         EditingFinished?.Invoke(this, EventArgs.Empty);
+        AppEx.GetService<ProfileService>().SaveProfile();
     }
 
     private void Selector_OnSelectionChanged(object sender, SelectionChangedEventArgs e)