修复搜索崩溃的问题 (#211)

Richasy · Jan 6, 2024 · 7c0d248 · 7c0d248
1 parent 093915c
commit 7c0d248
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/src/App/Controls/Base/CardPanel/CardPanel.xaml b/src/App/Controls/Base/CardPanel/CardPanel.xaml
@@ -97,6 +97,9 @@
                                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HostContainer" Storyboard.TargetProperty="Stroke">
                                                 <DiscreteObjectKeyFrame KeyTime="0" Value="{Binding Path=DisabledBorderBrush, RelativeSource={RelativeSource Mode=TemplatedParent}, UpdateSourceTrigger=PropertyChanged}" />
                                             </ObjectAnimationUsingKeyFrames>
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextFillColorDisabledBrush}" />
+                                            </ObjectAnimationUsingKeyFrames>
                                         </Storyboard>
                                     </VisualState.Storyboard>
                                 </VisualState>

diff --git a/src/App/Controls/Modules/SearchNavListModule.xaml b/src/App/Controls/Modules/SearchNavListModule.xaml
@@ -39,6 +39,7 @@
                             <base:CardPanel
                                 Click="OnModuleItemClick"
                                 DataContext="{x:Bind}"
+                                DisabledBackground="Transparent"
                                 IsChecked="{x:Bind IsSelected, Mode=OneWay}"
                                 IsEnableCheck="False"
                                 IsEnabled="{x:Bind IsEnabled, Mode=OneWay}">

diff --git a/src/App/Forms/MainWindow.xaml.cs b/src/App/Forms/MainWindow.xaml.cs
@@ -193,7 +193,10 @@ private void OnRequestSearch(object sender, string e)
 
         if (OverlayFrame.Content is not SearchPage)
         {
-            _ = OverlayFrame.Navigate(typeof(SearchPage), _appViewModel.Search);
+            var vm = new SearchDetailViewModel();
+            vm.SetKeyword(e);
+            vm.InitializeCommand.Execute(default);
+            _ = OverlayFrame.Navigate(typeof(SearchPage), vm);
         }
     }
 

diff --git a/src/ViewModels/Components/AppViewModel/AppViewModel.Properties.cs b/src/ViewModels/Components/AppViewModel/AppViewModel.Properties.cs
@@ -47,9 +47,6 @@ public sealed partial class AppViewModel
     [ObservableProperty]
     private bool _isOverlayShown;
 
-    [ObservableProperty]
-    private SearchDetailViewModel _search;
-
     [ObservableProperty]
     private MessageDetailViewModel _message;
 

diff --git a/src/ViewModels/Components/AppViewModel/AppViewModel.cs b/src/ViewModels/Components/AppViewModel/AppViewModel.cs
@@ -37,7 +37,6 @@ private AppViewModel()
         _dispatcherQueue = DispatcherQueue.GetForCurrentThread();
         NavigateItems = new ObservableCollection<NavigateItemViewModel>();
         DisplayWindows = new List<Window>();
-        Search = new SearchDetailViewModel();
         Message = MessageDetailViewModel.Instance;
         Fans = new FansDetailViewModel();
         Follows = MyFollowsDetailViewModel.Instance;
@@ -185,8 +184,6 @@ private void OpenPlaylist(List<VideoInformation> playlist)
     private void SearchContent(string text)
     {
         IsOverlayShown = true;
-        Search.SetKeyword(text);
-        Search.InitializeCommand.Execute(default);
         RequestSearch?.Invoke(this, text);
     }