编辑界面稳定优化

Author: HelloWRC

StickyHomeworks/MainWindow.xaml

@@ -353,6 +353,7 @@
                           ScrollViewer.HorizontalScrollBarVisibility="Auto"
                           ScrollViewer.VerticalScrollBarVisibility="Disabled"
                           ScrollViewer.CanContentScroll="False"
+                          SelectionChanged="MainListView_OnSelectionChanged"
                           Visibility="{Binding ViewModel.IsExpanded, Converter={StaticResource BooleanToVisibilityConverter}}"
                           x:Name="MainListView" 
                           d:ItemsSource="{d:SampleData ItemCount=5}">
@@ -421,10 +422,10 @@
                                             Visibility="{Binding IsSelected, RelativeSource={RelativeSource FindAncestor, AncestorType=ListBoxItem}, Converter={StaticResource BooleanToVisibilityConverter}}">
                                     <Button Content="{materialDesign:PackIcon EditOutline}"
                                             Style="{StaticResource MaterialDesignToolForegroundButton}"
-                                            Margin="4 -8" ToolTip="编辑" Click="ButtonEditHomework_OnClick" />
+                                            Margin="4 0" ToolTip="编辑" Click="ButtonEditHomework_OnClick" />
                                     <Button Content="{materialDesign:PackIcon DeleteOutline}"
                                             Style="{StaticResource MaterialDesignToolForegroundButton}"
-                                            Margin="4 -8" ToolTip="删除" Foreground="IndianRed"
+                                            Margin="4 0" ToolTip="删除" Foreground="IndianRed"
                                             Click="ButtonRemoveHomework_OnClick" />
                                 </StackPanel>
                             </StackPanel>

StickyHomeworks/MainWindow.xaml.cs

@@ -21,6 +21,7 @@
 using StickyHomeworks.ViewModels;
 using StickyHomeworks.Views;
 using System.Windows.Automation;
+using System.Windows.Forms;
 
 namespace StickyHomeworks;
 
@@ -71,7 +72,7 @@ private void OnFocusChangedHandler(object sender, AutomationFocusChangedEventArg
             if (proc.Id != Environment.ProcessId &&
                 !new List<string>(["ctfmon", "textinputhost", "chsime"]).Contains(proc.ProcessName.ToLower()))
             {
-                Dispatcher.Invoke(ExitEditingMode);
+                Dispatcher.Invoke(() => ExitEditingMode());
             }
         }
         catch
@@ -80,9 +81,10 @@ private void OnFocusChangedHandler(object sender, AutomationFocusChangedEventArg
         }
     }
 
-    private void ExitEditingMode()
+    private void ExitEditingMode(bool hard=true)
     {
-        MainListView.SelectedIndex = -1;
+        if (hard)
+            MainListView.SelectedIndex = -1;
         ViewModel.IsDrawerOpened = false;
         AppEx.GetService<HomeworkEditWindow>().TryClose();
     }
@@ -140,6 +142,8 @@ private void OnSubjectChanged(object? sender, EventArgs e)
             return;
         if (ViewModel.SelectedHomework == null)
             return;
+        if (!ViewModel.IsDrawerOpened)
+            return;
         ViewModel.IsUpdatingHomeworkSubject = true;
         var s = ViewModel.SelectedHomework;
         ProfileService.Profile.Homeworks.Remove(s);
@@ -171,6 +175,8 @@ private void ButtonCreateHomework_OnClick(object sender, RoutedEventArgs e)
         SettingsService.SaveSettings();
         ProfileService.SaveProfile();
         ViewModel.IsUpdatingHomeworkSubject = false;
+        RepositionEditingWindow();
+        AppEx.GetService<HomeworkEditWindow>().TryOpen();
     }
 
     private void ButtonAddHomeworkCompleted_OnClick(object sender, RoutedEventArgs e)
@@ -251,14 +257,15 @@ private void ButtonEditHomework_OnClick(object sender, RoutedEventArgs e)
 
     private void RepositionEditingWindow()
     {
-        if (ViewModel.SelectedListBoxItem != null)
-        {
-            Debug.WriteLine("selected changed");
-            GetCurrentDpi(out var dpiX, out var dpiY);
-            var p = ViewModel.SelectedListBoxItem.PointToScreen(new Point(ViewModel.SelectedListBoxItem.ActualWidth, 0));
-            AppEx.GetService<HomeworkEditWindow>().Left = p.X / dpiX;
-            AppEx.GetService<HomeworkEditWindow>().Top = p.Y / dpiY;
-        }
+        if (ViewModel.SelectedListBoxItem == null) 
+            return;
+        Debug.WriteLine("selected changed");
+        GetCurrentDpi(out var dpiX, out var dpiY);
+        var p = ViewModel.SelectedListBoxItem.PointToScreen(new Point(ViewModel.SelectedListBoxItem.ActualWidth, 0));
+        var screen = Screen.PrimaryScreen!.WorkingArea;
+        var homeworkEditWindow = AppEx.GetService<HomeworkEditWindow>();
+        homeworkEditWindow.Left = p.X / dpiX;
+        homeworkEditWindow.Top = Math.Min(p.Y, screen.Bottom - homeworkEditWindow.ActualHeight * dpiY) / dpiY;
     }
 
     private void ButtonRemoveHomework_OnClick(object sender, RoutedEventArgs e)
@@ -413,6 +420,6 @@ private void ButtonMore_Click(object sender, RoutedEventArgs e)
 
     private void MainListView_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
     {
-        RepositionEditingWindow();
+        ExitEditingMode(false);
     }
 }