diff --git a/Control/Other/SearchResControl.xaml.cs b/Control/Other/SearchResControl.xaml.cs index d81c144..9d8ffea 100644 --- a/Control/Other/SearchResControl.xaml.cs +++ b/Control/Other/SearchResControl.xaml.cs @@ -253,7 +253,7 @@ namespace GeekDesk.Control.Other { EveryThingRuning = true; MainWindow.mainWindow.RightCard.Loading_RightCard.Visibility = Visibility.Visible; - string[] split = MainWindow.mainWindow.TotalMsgBtn.Content.ToString().Split(' '); + string[] split = MainWindow.mainWindow.SearchResText.Text.Split(' '); long count = Convert.ToInt64(split[0]); ObservableCollection resList = this.DataContext as ObservableCollection; @@ -264,7 +264,7 @@ namespace GeekDesk.Control.Other this.Dispatcher.Invoke(() => { count += searchRes.Count; - MainWindow.mainWindow.TotalMsgBtn.Content = count + " of " + split[split.Length - 1]; + MainWindow.mainWindow.SearchResText.Text = count + " of " + split[split.Length - 1]; foreach (IconInfo info in searchRes) { resList.Add(info); diff --git a/MainWindow.xaml b/MainWindow.xaml index de1d33d..3b24513 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -142,16 +142,16 @@ - + + + { string inputText = SearchBox.Text.ToLower().Trim(); @@ -179,7 +179,7 @@ namespace GeekDesk if (appData.AppConfig.EnableEveryThing == true) { - ObservableCollection iconBakList = EveryThingUtil.Search(inputText); + ObservableCollection iconBakList = EveryThingUtil.Search(inputText); foreach (IconInfo icon in iconBakList) { resList.Add(icon); @@ -206,7 +206,8 @@ namespace GeekDesk { if (appData.AppConfig.EnableEveryThing == true) { - TotalMsgBtn.Visibility = Visibility.Visible; + SearchResText.Text = resList.Count + " of " + Convert.ToInt32(EveryThingUtil.Everything_GetNumResults()); + SearchResContainer.Visibility = Visibility.Visible; } SearchResControl control = new SearchResControl(resList); RightCard.VerticalCard.Content = control; @@ -337,8 +338,8 @@ namespace GeekDesk SearchBox.Clear(); SearchBox.TextChanged += SearchBox_TextChanged; SearchBox.Width = 0; - TotalMsgBtn.Content = "0 of 0"; - TotalMsgBtn.Visibility = Visibility.Hidden; + SearchResText.Text = "0 of 0"; + SearchResContainer.Visibility = Visibility.Collapsed; RightCard.VerticalCard.Content = null; RightCard.VisibilitySearchCard(Visibility.Collapsed); });