Skip to content

Commit f13ed7b

Browse files
SlimeNullSlimeNull
committed
feat: 支持原地显示文档
1 parent ca5223d commit f13ed7b

File tree

27 files changed

+383
-170
lines changed

27 files changed

+383
-170
lines changed

‎src/CurvaLauncher.Common/IAsyncQueryResult.cs ‎src/CurvaLauncher.Common/IAsyncActionQueryResult.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace CurvaLauncher;
22

3-
public interface IAsyncQueryResult : IQueryResult
3+
public interface IAsyncActionQueryResult : IQueryResult
44
{
55
public Task InvokeAsync(CancellationToken cancellationToken);
66
}

‎src/CurvaLauncher.Common/IAsyncDocumentQueryResult.cs

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
using System.Windows.Documents;
2+
3+
namespace CurvaLauncher;
4+
5+
public interface IAsyncDocumentQueryResult : IQueryResult
6+
{
7+
public Task<FlowDocument> GenerateDocumentAsync(CancellationToken cancellationToken);
8+
}

‎src/CurvaLauncher.Common/ISyncQueryResult.cs ‎src/CurvaLauncher.Common/ISyncActionQueryResult.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace CurvaLauncher;
22

3-
public interface ISyncQueryResult : IQueryResult
3+
public interface ISyncActionQueryResult : IQueryResult
44
{
55
public void Invoke();
66
}

‎src/CurvaLauncher.Common/ISyncDocumentQueryResult.cs

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
using System.Windows.Documents;
2+
3+
namespace CurvaLauncher;
4+
5+
public interface ISyncDocumentQueryResult : IQueryResult
6+
{
7+
public FlowDocument GenerateDocument();
8+
}

‎src/CurvaLauncher/CurvaLauncher.csproj

+4-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<ApplicationManifest>app.manifest</ApplicationManifest>
1313
<ApplicationIcon>Assets\Icon.ico</ApplicationIcon>
1414

15-
<Version>0.6.1-beta</Version>
15+
<Version>0.7.1-beta</Version>
1616

1717
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1818
<EnableWindowsTargeting>true</EnableWindowsTargeting>
@@ -26,7 +26,9 @@
2626
<ItemGroup>
2727
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
2828
<PackageReference Include="EleCho.GlobalHotkey.Windows" Version="1.0.2" />
29-
<PackageReference Include="EleCho.WpfSuite" Version="0.8.1" />
29+
<PackageReference Include="EleCho.WpfSuite.Common" Version="0.9.3" />
30+
<PackageReference Include="EleCho.WpfSuite.Controls" Version="0.9.14" />
31+
<PackageReference Include="EleCho.WpfSuite.Layouts" Version="0.9.0.1" />
3032
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
3133
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
3234
<PackageReference Include="SharpVectors.Wpf" Version="1.8.2" />

‎src/CurvaLauncher/MainWindow.xaml

+98-72
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors"
99
xmlns:utils="clr-namespace:CurvaLauncher.Utilities"
1010
xmlns:models="clr-namespace:CurvaLauncher.Models"
11+
xmlns:models_imr="clr-namespace:CurvaLauncher.Models.ImmediateResults"
1112
xmlns:ws="https://schemas.elecho.dev/wpfsuite"
1213
xmlns:tb="http://www.hardcodet.net/taskbar"
1314
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
@@ -30,7 +31,7 @@
3031
Deactivated="WindowDeactivated">
3132

3233
<Window.InputBindings>
33-
<KeyBinding Key="Esc" Command="{x:Static local:App.CloseLauncherCommand}"/>
34+
<KeyBinding Key="Esc" Command="{Binding ViewModel.EscapeCommand}"/>
3435
<KeyBinding Key="Up" Command="{Binding ViewModel.SelectPrevCommand}"/>
3536
<KeyBinding Key="Down" Command="{Binding ViewModel.SelectNextCommand}"/>
3637
<KeyBinding Key="Return" Command="{Binding ViewModel.InvokeSelectedCommand}"/>
@@ -41,6 +42,10 @@
4142

4243
<Window.Resources>
4344
<BooleanToVisibilityConverter x:Key="bool2visibility"/>
45+
<ws:BindingProxy x:Key="AppConfigProxy"
46+
Data="{Binding AppConfig}"/>
47+
<ws:BindingProxy x:Key="ViewModelProxy"
48+
Data="{Binding ViewModel}"/>
4449
</Window.Resources>
4550

4651
<Grid>
@@ -52,35 +57,52 @@
5257
<ColumnDefinition Width="Auto"/>
5358
</Grid.ColumnDefinitions>
5459

55-
<ui:TextBox Name="QueryBox"
56-
Text="{Binding ViewModel.QueryText,UpdateSourceTrigger=PropertyChanged}"
57-
FontSize="{DynamicResource QueryBoxTextSize}"
58-
FocusVisualStyle="{x:Null}"
59-
ClearButtonEnabled="True"
60-
PlaceholderText="Hello CurvaLauncher"
61-
PreviewKeyDown="QueryBox_PreviewKeyDown">
62-
<ui:TextBox.InputBindings>
63-
<KeyBinding Key="Up" Command="{Binding ViewModel.SelectPrevCommand}"/>
64-
<KeyBinding Key="Down" Command="{Binding ViewModel.SelectNextCommand}"/>
65-
<KeyBinding Key="Return" Command="{Binding ViewModel.InvokeSelectedCommand}"/>
66-
</ui:TextBox.InputBindings>
67-
<ui:TextBox.ContextMenu>
68-
<ContextMenu FontSize="14" HasDropShadow="True"
69-
BorderBrush="#80777777">
70-
<ui:MenuItem Header="{DynamicResource StrCut}" Command="ApplicationCommands.Cut"/>
71-
<ui:MenuItem Header="{DynamicResource StrCopy}" Command="ApplicationCommands.Copy"/>
72-
<ui:MenuItem Header="{DynamicResource StrPaste}" Command="ApplicationCommands.Paste"/>
73-
<Separator/>
74-
<ui:MenuItem Header="{DynamicResource StrSettings}" Command="{x:Static local:App.ShowLauncherSettingsCommand}"/>
75-
<ui:MenuItem Header="{DynamicResource StrExit}" Command="{x:Static local:App.ShutdownCommand}"/>
76-
</ContextMenu>
77-
</ui:TextBox.ContextMenu>
78-
<behaviors:Interaction.Triggers>
79-
<behaviors:EventTrigger EventName="TextChanged">
80-
<behaviors:InvokeCommandAction Command="{Binding ViewModel.QueryCommand}"/>
81-
</behaviors:EventTrigger>
82-
</behaviors:Interaction.Triggers>
83-
</ui:TextBox>
60+
<Grid>
61+
<Grid.ColumnDefinitions>
62+
<ColumnDefinition Width="Auto"/>
63+
<ColumnDefinition/>
64+
</Grid.ColumnDefinitions>
65+
66+
<ui:Button Content="&lt;"
67+
VerticalAlignment="Stretch"
68+
Width="{Binding RelativeSource={RelativeSource Self},Path=ActualHeight}"
69+
Margin="0 0 4 0"
70+
FontSize="20"
71+
FontWeight="Bold"
72+
Visibility="{Binding ViewModel.ShowImmediateResults,Converter={StaticResource bool2visibility}}"
73+
Command="{Binding ViewModel.EscapeCommand}"/>
74+
75+
<ui:TextBox Name="QueryBox"
76+
Grid.Column="1"
77+
Text="{Binding ViewModel.QueryText,UpdateSourceTrigger=PropertyChanged}"
78+
FontSize="{DynamicResource QueryBoxTextSize}"
79+
FocusVisualStyle="{x:Null}"
80+
ClearButtonEnabled="True"
81+
PlaceholderText="Hello CurvaLauncher"
82+
PreviewKeyDown="QueryBox_PreviewKeyDown">
83+
<ui:TextBox.InputBindings>
84+
<KeyBinding Key="Up" Command="{Binding ViewModel.SelectPrevCommand}"/>
85+
<KeyBinding Key="Down" Command="{Binding ViewModel.SelectNextCommand}"/>
86+
<KeyBinding Key="Return" Command="{Binding ViewModel.InvokeSelectedCommand}"/>
87+
</ui:TextBox.InputBindings>
88+
<ui:TextBox.ContextMenu>
89+
<ContextMenu FontSize="14" HasDropShadow="True"
90+
BorderBrush="#80777777">
91+
<ui:MenuItem Header="{DynamicResource StrCut}" Command="ApplicationCommands.Cut"/>
92+
<ui:MenuItem Header="{DynamicResource StrCopy}" Command="ApplicationCommands.Copy"/>
93+
<ui:MenuItem Header="{DynamicResource StrPaste}" Command="ApplicationCommands.Paste"/>
94+
<Separator/>
95+
<ui:MenuItem Header="{DynamicResource StrSettings}" Command="{x:Static local:App.ShowLauncherSettingsCommand}"/>
96+
<ui:MenuItem Header="{DynamicResource StrExit}" Command="{x:Static local:App.ShutdownCommand}"/>
97+
</ContextMenu>
98+
</ui:TextBox.ContextMenu>
99+
<behaviors:Interaction.Triggers>
100+
<behaviors:EventTrigger EventName="TextChanged">
101+
<behaviors:InvokeCommandAction Command="{Binding ViewModel.QueryCommand}"/>
102+
</behaviors:EventTrigger>
103+
</behaviors:Interaction.Triggers>
104+
</ui:TextBox>
105+
</Grid>
84106

85107
<ui:ProgressRing Grid.Column="1" Margin="7 0 0 0" IsIndeterminate="True">
86108
<ui:ProgressRing.Style>
@@ -89,8 +111,8 @@
89111
<Style.Triggers>
90112
<MultiDataTrigger>
91113
<MultiDataTrigger.Conditions>
92-
<Condition Binding="{Binding ViewModel.HasQueryResult}" Value="True"/>
93-
<Condition Binding="{Binding ViewModel.SelectedQueryResult.InvokeCommand.IsRunning}" Value="True"/>
114+
<Condition Binding="{Binding ViewModel.ShowQueryResult}" Value="True"/>
115+
<Condition Binding="{Binding ViewModel.InvokeCommand.IsRunning}" Value="True"/>
94116
</MultiDataTrigger.Conditions>
95117
<MultiDataTrigger.Setters>
96118
<Setter Property="Visibility" Value="Visible"/>
@@ -104,7 +126,8 @@
104126
</ui:ProgressRing.LayoutTransform>
105127
</ui:ProgressRing>
106128
</Grid>
107-
<ws:ConditionalControl Condition="{Binding ViewModel.HasQueryResult}">
129+
130+
<ws:ConditionalControl Condition="{Binding ViewModel.ShowQueryResult}">
108131
<ListView Name="resultBox" Margin="0 5 0 0" MinHeight="0"
109132
Height="Auto"
110133
MaxHeight="{Binding AppConfig.LauncherResultViewHeight}"
@@ -122,59 +145,62 @@
122145
<ListView.ItemTemplate>
123146
<DataTemplate DataType="models:QueryResultModel">
124147
<Border Padding="{DynamicResource QueryResultPaddingThickness}">
125-
<Border.Resources>
126-
<ws:BindingProxy x:Key="Proxy" Data="{Binding}"/>
127-
</Border.Resources>
128-
<Button Command="{Binding InvokeCommand}">
129-
<Button.Template>
130-
<ControlTemplate TargetType="Button">
131-
<ContentPresenter Content="{TemplateBinding Content}"/>
132-
</ControlTemplate>
133-
</Button.Template>
134-
135-
<Grid VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
136-
<Grid.ColumnDefinitions>
137-
<ColumnDefinition Width="Auto"/>
138-
<ColumnDefinition Width="8"/>
139-
<ColumnDefinition/>
140-
</Grid.ColumnDefinitions>
148+
<Grid VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
149+
<Grid.ColumnDefinitions>
150+
<ColumnDefinition Width="Auto"/>
151+
<ColumnDefinition Width="8"/>
152+
<ColumnDefinition/>
153+
</Grid.ColumnDefinitions>
141154

142-
<Border Width="{DynamicResource QueryResultIconSize}"
143-
Height="{DynamicResource QueryResultIconSize}"
144-
CornerRadius="{DynamicResource QueryResultIconCornerRadius}">
145-
<Border.Background>
146-
<ImageBrush Stretch="Uniform"
147-
ImageSource="{Binding Source={StaticResource Proxy}, Path=Data.Icon}"/>
148-
</Border.Background>
149-
</Border>
155+
<Border Width="{DynamicResource QueryResultIconSize}"
156+
Height="{DynamicResource QueryResultIconSize}"
157+
CornerRadius="{DynamicResource QueryResultIconCornerRadius}">
158+
<Border.Background>
159+
<ImageBrush Stretch="Uniform"
160+
ImageSource="{Binding Icon}"/>
161+
</Border.Background>
162+
</Border>
150163

151-
<Grid Grid.Column="2">
152-
<Grid.RowDefinitions>
153-
<RowDefinition/>
154-
<RowDefinition/>
155-
</Grid.RowDefinitions>
156-
<TextBlock Text="{Binding Title}"
157-
FontSize="{DynamicResource QueryResultTitleTextSize}"
158-
Foreground="{DynamicResource TextFillColorPrimaryBrush}"/>
159-
<TextBlock Grid.Row="1"
160-
TextTrimming="WordEllipsis"
161-
Text="{Binding Description}"
162-
FontSize="{DynamicResource QueryResultDescriptionTextSize}"
163-
Foreground="{DynamicResource TextFillColorSecondaryBrush}"/>
164-
</Grid>
164+
<Grid Grid.Column="2">
165+
<Grid.RowDefinitions>
166+
<RowDefinition/>
167+
<RowDefinition/>
168+
</Grid.RowDefinitions>
169+
<TextBlock Text="{Binding Title}"
170+
FontSize="{DynamicResource QueryResultTitleTextSize}"
171+
Foreground="{DynamicResource TextFillColorPrimaryBrush}"/>
172+
<TextBlock Grid.Row="1"
173+
TextTrimming="WordEllipsis"
174+
Text="{Binding Description}"
175+
FontSize="{DynamicResource QueryResultDescriptionTextSize}"
176+
Foreground="{DynamicResource TextFillColorSecondaryBrush}"/>
165177
</Grid>
166-
</Button>
178+
</Grid>
167179
</Border>
168180
</DataTemplate>
169181
</ListView.ItemTemplate>
170182
<ListView.ItemContainerStyle>
171183
<Style TargetType="{x:Type ListViewItem}" BasedOn="{StaticResource {x:Type ListViewItem}}">
172184
<Setter Property="BorderThickness" Value="0" />
173185
<Setter Property="HorizontalContentAlignment" Value="Stretch"/>
186+
<EventSetter Event="PreviewMouseDown"
187+
Handler="ResultBoxItemMouseDown"/>
174188
</Style>
175189
</ListView.ItemContainerStyle>
176190
</ListView>
177191
</ws:ConditionalControl>
192+
193+
<ContentControl Visibility="{Binding ViewModel.ShowImmediateResults,Converter={StaticResource bool2visibility}}"
194+
Content="{Binding ViewModel.CurrentImmediateResult}">
195+
<ContentControl.Resources>
196+
<DataTemplate DataType="{x:Type models_imr:DocumentResult}">
197+
<FlowDocumentScrollViewer Document="{Binding Document}"
198+
MinHeight="{Binding Source={StaticResource AppConfigProxy},Path=Data.LauncherResultViewHeight}">
199+
200+
</FlowDocumentScrollViewer>
201+
</DataTemplate>
202+
</ContentControl.Resources>
203+
</ContentControl>
178204
</StackPanel>
179205
</Border>
180206

‎src/CurvaLauncher/MainWindow.xaml.cs

+30-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
using System;
22
using System.Windows;
3+
using System.Windows.Controls;
34
using System.Windows.Input;
45
using CommunityToolkit.Mvvm.ComponentModel;
56
using CommunityToolkit.Mvvm.Input;
7+
using CurvaLauncher.Models;
68
using CurvaLauncher.Services;
79
using CurvaLauncher.ViewModels;
810
using Wpf.Ui.Appearance;
@@ -47,6 +49,7 @@ private void WindowClosing(object sender, System.ComponentModel.CancelEventArgs
4749
private void WindowActivated(object sender, EventArgs e)
4850
{
4951
FocusManager.SetFocusedElement(this, QueryBox);
52+
ViewModel.QueryCommand.Execute(null);
5053
Focus();
5154
}
5255

@@ -55,6 +58,11 @@ private void WindowDeactivated(object sender, EventArgs e)
5558
if (AppConfig.KeepLauncherWhenFocusLost)
5659
return;
5760

61+
ViewModel.QueryResults.Clear();
62+
ViewModel.SelectedQueryResult = null;
63+
64+
resultBox.SelectedItem = null;
65+
5866
App.CloseLauncher();
5967
}
6068

@@ -73,7 +81,17 @@ private void QueryBox_PreviewKeyDown(object sender, KeyEventArgs e)
7381
[RelayCommand]
7482
public void ScrollToSelectedQueryResult()
7583
{
76-
resultBox.ScrollIntoView(resultBox.SelectedItem);
84+
if (resultBox.SelectedItem is null ||
85+
resultBox.SelectedIndex < 0)
86+
{
87+
return;
88+
}
89+
90+
try
91+
{
92+
resultBox.ScrollIntoView(resultBox.SelectedItem);
93+
}
94+
catch { }
7795
}
7896

7997
public void SetQueryText(string text)
@@ -82,4 +100,15 @@ public void SetQueryText(string text)
82100
QueryBox.SelectionStart = text.Length;
83101
QueryBox.SelectionLength = 0;
84102
}
103+
104+
private void ResultBoxItemMouseDown(object sender, MouseButtonEventArgs e)
105+
{
106+
if (sender is not ListBoxItem lbi ||
107+
lbi.Content is not QueryResultModel queryResult)
108+
{
109+
return;
110+
}
111+
112+
ViewModel.InvokeCommand.Execute(queryResult);
113+
}
85114
}

‎src/CurvaLauncher/Models/ImmediateResults/DocumentResult.cs

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
using System.Windows.Documents;
2+
3+
namespace CurvaLauncher.Models.ImmediateResults
4+
{
5+
public class DocumentResult : ImmediateResult
6+
{
7+
public FlowDocument Document { get; }
8+
9+
public DocumentResult(FlowDocument document)
10+
{
11+
Document = document;
12+
}
13+
}
14+
}

‎src/CurvaLauncher/Models/ImmediateResults/ImmediateResult.cs

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
using System;
2+
using System.Linq;
3+
using System.Text;
4+
using System.Threading.Tasks;
5+
6+
namespace CurvaLauncher.Models.ImmediateResults
7+
{
8+
public abstract class ImmediateResult
9+
{
10+
11+
}
12+
}

0 commit comments

Comments
 (0)