admin/GeekDesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

✅ 优化搜索结果显示UI

Browse Source
This commit is contained in:
BookerLiu
2023-04-14 14:26:42 +08:00
parent 41799251af
commit 29bb799f11
3 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Control/Other/SearchResControl.xaml.cs
View File

@@ -253,7 +253,7 @@ namespace GeekDesk.Control.Other
{ {
EveryThingRuning = true; EveryThingRuning = true;
MainWindow.mainWindow.RightCard.Loading_RightCard.Visibility = Visibility.Visible; 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]); long count = Convert.ToInt64(split[0]);
ObservableCollection<IconInfo> resList = this.DataContext as ObservableCollection<IconInfo>; ObservableCollection<IconInfo> resList = this.DataContext as ObservableCollection<IconInfo>;
@@ -264,7 +264,7 @@ namespace GeekDesk.Control.Other
this.Dispatcher.Invoke(() => this.Dispatcher.Invoke(() =>
{ {
count += searchRes.Count; 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) foreach (IconInfo info in searchRes)
{ {
resList.Add(info); resList.Add(info);

17
MainWindow.xaml
View File

@@ -142,16 +142,16 @@
<!--分割线--> <!--分割线-->
<GridSplitter Opacity="0" Grid.Row="1" Grid.Column="0" Width="1" VerticalAlignment="Stretch" HorizontalAlignment="Right"/> <GridSplitter Opacity="0" Grid.Row="1" Grid.Column="0" Width="1" VerticalAlignment="Stretch" HorizontalAlignment="Right"/>
<Button x:Name="TotalMsgBtn" Panel.ZIndex="2" <Border x:Name="SearchResContainer" Panel.ZIndex="2"
Visibility="Hidden" Visibility="Collapsed"
Grid.Row="1" Grid.Column="1" Grid.Row="1" Grid.Column="1"
HorizontalAlignment="Right" MaxWidth="200" HorizontalAlignment="Right" MaxWidth="200"
VerticalAlignment="Top" VerticalAlignment="Top"
CornerRadius="8"
Margin="0,20,40,0" Margin="0,20,40,0"
> >
<Button.Content>0 of 0</Button.Content> <Border.Style>
<Button.Style> <Style TargetType="Border" >
<Style TargetType="Button" BasedOn="{StaticResource Btn1}">
<Setter Property="Background"> <Setter Property="Background">
<Setter.Value> <Setter.Value>
<SolidColorBrush Color="White" Opacity="0.6"/> <SolidColorBrush Color="White" Opacity="0.6"/>
@@ -159,8 +159,9 @@
</Setter> </Setter>
<Setter Property="MaxWidth" Value="300"/> <Setter Property="MaxWidth" Value="300"/>
</Style> </Style>
</Button.Style> </Border.Style>
</Button> <TextBlock Margin="8" FontSize="13" x:Name="SearchResText" Text="0 of 0" Opacity="0.6"/>
</Border>
<!--搜索输入框--> <!--搜索输入框-->
<TextBox Panel.ZIndex="2" Grid.Row="0" Grid.Column="1" <TextBox Panel.ZIndex="2" Grid.Row="0" Grid.Column="1"

11
MainWindow.xaml.cs
View File

@@ -133,6 +133,7 @@ namespace GeekDesk
RunTimeStatus.EVERYTHING_NEW_SEARCH = true; RunTimeStatus.EVERYTHING_NEW_SEARCH = true;
//显示搜索结果列表 //显示搜索结果列表
RightCard.VisibilitySearchCard(Visibility.Visible); RightCard.VisibilitySearchCard(Visibility.Visible);
SearchResContainer.Visibility = Visibility.Collapsed;
object obj = RightCard.VerticalCard.Content; object obj = RightCard.VerticalCard.Content;
if (obj != null) if (obj != null)
{ {
@@ -168,7 +169,6 @@ namespace GeekDesk
} }
RunTimeStatus.EVERYTHING_NEW_SEARCH = false; RunTimeStatus.EVERYTHING_NEW_SEARCH = false;
this.Dispatcher.Invoke(() => this.Dispatcher.Invoke(() =>
{ {
string inputText = SearchBox.Text.ToLower().Trim(); string inputText = SearchBox.Text.ToLower().Trim();
@@ -179,7 +179,7 @@ namespace GeekDesk
if (appData.AppConfig.EnableEveryThing == true) if (appData.AppConfig.EnableEveryThing == true)
{ {
ObservableCollection<IconInfo> iconBakList = EveryThingUtil.Search(inputText); ObservableCollection<IconInfo> iconBakList = EveryThingUtil.Search(inputText);
foreach (IconInfo icon in iconBakList) foreach (IconInfo icon in iconBakList)
{ {
resList.Add(icon); resList.Add(icon);
@@ -206,7 +206,8 @@ namespace GeekDesk
{ {
if (appData.AppConfig.EnableEveryThing == true) 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); SearchResControl control = new SearchResControl(resList);
RightCard.VerticalCard.Content = control; RightCard.VerticalCard.Content = control;
@@ -337,8 +338,8 @@ namespace GeekDesk
SearchBox.Clear(); SearchBox.Clear();
SearchBox.TextChanged += SearchBox_TextChanged; SearchBox.TextChanged += SearchBox_TextChanged;
SearchBox.Width = 0; SearchBox.Width = 0;
TotalMsgBtn.Content = "0 of 0"; SearchResText.Text = "0 of 0";
TotalMsgBtn.Visibility = Visibility.Hidden; SearchResContainer.Visibility = Visibility.Collapsed;
RightCard.VerticalCard.Content = null; RightCard.VerticalCard.Content = null;
RightCard.VisibilitySearchCard(Visibility.Collapsed); RightCard.VisibilitySearchCard(Visibility.Collapsed);
}); });