Skip to content

Commit 6893293

Browse files
SlimeNullSlimeNull
committed
feat: 支持子菜单
1 parent f13ed7b commit 6893293

19 files changed

+284
-131
lines changed

‎src/CurvaLauncher.Common/IAsyncMenuQueryResult.cs

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
namespace CurvaLauncher;
2+
3+
public interface IAsyncMenuQueryResult : IQueryResult
4+
{
5+
public Task<IEnumerable<IQueryResult>> GetMenuItemsAsync(CancellationToken cancellationToken);
6+
}

‎src/CurvaLauncher.Common/ISyncMenuQueryResult.cs

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
namespace CurvaLauncher;
2+
3+
public interface ISyncMenuQueryResult : IQueryResult
4+
{
5+
public IEnumerable<IQueryResult> GetMenuItems();
6+
}

‎src/CurvaLauncher/MainWindow.xaml

+69-4
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,18 @@
3232

3333
<Window.InputBindings>
3434
<KeyBinding Key="Esc" Command="{Binding ViewModel.EscapeCommand}"/>
35+
<KeyBinding Key="Return" Command="{Binding ViewModel.InvokeSelectedCommand}"/>
3536
<KeyBinding Key="Up" Command="{Binding ViewModel.SelectPrevCommand}"/>
3637
<KeyBinding Key="Down" Command="{Binding ViewModel.SelectNextCommand}"/>
37-
<KeyBinding Key="Return" Command="{Binding ViewModel.InvokeSelectedCommand}"/>
3838
<KeyBinding Modifiers="Ctrl" Key="Return" Command="{Binding ViewModel.InvokeSelectedCommand}"/>
3939
<KeyBinding Modifiers="Alt" Key="Return" Command="{Binding ViewModel.InvokeSelectedCommand}"/>
4040
<KeyBinding Modifiers="Ctrl+Alt" Key="Return" Command="{Binding ViewModel.InvokeSelectedCommand}"/>
4141
</Window.InputBindings>
4242

4343
<Window.Resources>
4444
<BooleanToVisibilityConverter x:Key="bool2visibility"/>
45+
<ws:BindingProxy x:Key="WindowProxy"
46+
Data="{Binding}"/>
4547
<ws:BindingProxy x:Key="AppConfigProxy"
4648
Data="{Binding AppConfig}"/>
4749
<ws:BindingProxy x:Key="ViewModelProxy"
@@ -111,7 +113,6 @@
111113
<Style.Triggers>
112114
<MultiDataTrigger>
113115
<MultiDataTrigger.Conditions>
114-
<Condition Binding="{Binding ViewModel.ShowQueryResult}" Value="True"/>
115116
<Condition Binding="{Binding ViewModel.InvokeCommand.IsRunning}" Value="True"/>
116117
</MultiDataTrigger.Conditions>
117118
<MultiDataTrigger.Setters>
@@ -128,7 +129,7 @@
128129
</Grid>
129130

130131
<ws:ConditionalControl Condition="{Binding ViewModel.ShowQueryResult}">
131-
<ListView Name="resultBox" Margin="0 5 0 0" MinHeight="0"
132+
<ListView Name="ResultBox" Margin="0 5 0 0" MinHeight="0"
132133
Height="Auto"
133134
MaxHeight="{Binding AppConfig.LauncherResultViewHeight}"
134135
BorderThickness="0"
@@ -139,7 +140,8 @@
139140
SelectedIndex="{Binding ViewModel.SelectedQueryResultIndex}">
140141
<behaviors:Interaction.Triggers>
141142
<behaviors:EventTrigger EventName="SelectionChanged">
142-
<behaviors:InvokeCommandAction Command="{Binding ScrollToSelectedQueryResultCommand}"/>
143+
<behaviors:InvokeCommandAction Command="{Binding ScrollToSelectedItemCommand}"
144+
CommandParameter="{x:Reference Name=ResultBox}"/>
143145
</behaviors:EventTrigger>
144146
</behaviors:Interaction.Triggers>
145147
<ListView.ItemTemplate>
@@ -193,6 +195,69 @@
193195
<ContentControl Visibility="{Binding ViewModel.ShowImmediateResults,Converter={StaticResource bool2visibility}}"
194196
Content="{Binding ViewModel.CurrentImmediateResult}">
195197
<ContentControl.Resources>
198+
<DataTemplate DataType="{x:Type models_imr:MenuResult}">
199+
<ListView Name="MenuResultBox" Margin="0 5 0 0" MinHeight="0"
200+
Height="Auto"
201+
MaxHeight="{Binding Source={StaticResource AppConfigProxy},Path=Data.LauncherResultViewHeight}"
202+
BorderThickness="0"
203+
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
204+
ScrollViewer.VerticalScrollBarVisibility="Auto"
205+
ItemsSource="{Binding Items}" d:ItemsSource="{d:SampleData ItemCount=5}"
206+
SelectedItem="{Binding SelectedItem,Mode=OneWayToSource}"
207+
SelectedIndex="{Binding SelectedIndex}">
208+
<behaviors:Interaction.Triggers>
209+
<behaviors:EventTrigger EventName="SelectionChanged">
210+
<behaviors:InvokeCommandAction Command="{Binding Source={StaticResource WindowProxy},Path=Data.ScrollToSelectedItemCommand}"
211+
CommandParameter="{x:Reference Name=MenuResultBox}"/>
212+
</behaviors:EventTrigger>
213+
</behaviors:Interaction.Triggers>
214+
<ListView.ItemTemplate>
215+
<DataTemplate DataType="models:QueryResultModel">
216+
<Border Padding="{DynamicResource QueryResultPaddingThickness}">
217+
<Grid VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
218+
<Grid.ColumnDefinitions>
219+
<ColumnDefinition Width="Auto"/>
220+
<ColumnDefinition Width="8"/>
221+
<ColumnDefinition/>
222+
</Grid.ColumnDefinitions>
223+
224+
<Border Width="{DynamicResource QueryResultIconSize}"
225+
Height="{DynamicResource QueryResultIconSize}"
226+
CornerRadius="{DynamicResource QueryResultIconCornerRadius}">
227+
<Border.Background>
228+
<ImageBrush Stretch="Uniform"
229+
ImageSource="{Binding Icon}"/>
230+
</Border.Background>
231+
</Border>
232+
233+
<Grid Grid.Column="2">
234+
<Grid.RowDefinitions>
235+
<RowDefinition/>
236+
<RowDefinition/>
237+
</Grid.RowDefinitions>
238+
<TextBlock Text="{Binding Title}"
239+
FontSize="{DynamicResource QueryResultTitleTextSize}"
240+
Foreground="{DynamicResource TextFillColorPrimaryBrush}"/>
241+
<TextBlock Grid.Row="1"
242+
TextTrimming="WordEllipsis"
243+
Text="{Binding Description}"
244+
FontSize="{DynamicResource QueryResultDescriptionTextSize}"
245+
Foreground="{DynamicResource TextFillColorSecondaryBrush}"/>
246+
</Grid>
247+
</Grid>
248+
</Border>
249+
</DataTemplate>
250+
</ListView.ItemTemplate>
251+
<ListView.ItemContainerStyle>
252+
<Style TargetType="{x:Type ListViewItem}" BasedOn="{StaticResource {x:Type ListViewItem}}">
253+
<Setter Property="BorderThickness" Value="0" />
254+
<Setter Property="HorizontalContentAlignment" Value="Stretch"/>
255+
<EventSetter Event="PreviewMouseDown"
256+
Handler="ResultBoxItemMouseDown"/>
257+
</Style>
258+
</ListView.ItemContainerStyle>
259+
</ListView>
260+
</DataTemplate>
196261
<DataTemplate DataType="{x:Type models_imr:DocumentResult}">
197262
<FlowDocumentScrollViewer Document="{Binding Document}"
198263
MinHeight="{Binding Source={StaticResource AppConfigProxy},Path=Data.LauncherResultViewHeight}">

‎src/CurvaLauncher/MainWindow.xaml.cs

+16-5
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,22 @@ private void WindowDeactivated(object sender, EventArgs e)
6161
ViewModel.QueryResults.Clear();
6262
ViewModel.SelectedQueryResult = null;
6363

64-
resultBox.SelectedItem = null;
64+
ResultBox.SelectedItem = null;
6565

6666
App.CloseLauncher();
6767
}
6868

6969

7070
private void QueryBox_PreviewKeyDown(object sender, KeyEventArgs e)
7171
{
72+
if (ViewModel.ImmediateResults.Count != 0)
73+
{
74+
return;
75+
}
76+
7277
if (e.Key == Key.Up &&
7378
string.IsNullOrWhiteSpace(ViewModel.QueryText) &&
79+
!string.IsNullOrWhiteSpace(ViewModel.LastInvokedQueryText) &&
7480
ViewModel.LastInvokedQueryText is string lastInvokedQueryText)
7581
{
7682
SetQueryText(lastInvokedQueryText);
@@ -79,17 +85,22 @@ private void QueryBox_PreviewKeyDown(object sender, KeyEventArgs e)
7985
}
8086

8187
[RelayCommand]
82-
public void ScrollToSelectedQueryResult()
88+
public void ScrollToSelectedItem(ListView? listView)
8389
{
84-
if (resultBox.SelectedItem is null ||
85-
resultBox.SelectedIndex < 0)
90+
if (listView is null)
91+
{
92+
return;
93+
}
94+
95+
if (listView.SelectedItem is null ||
96+
listView.SelectedIndex < 0)
8697
{
8798
return;
8899
}
89100

90101
try
91102
{
92-
resultBox.ScrollIntoView(resultBox.SelectedItem);
103+
listView.ScrollIntoView(listView.SelectedItem);
93104
}
94105
catch { }
95106
}

‎src/CurvaLauncher/Models/CurvaLauncherPluginInstance.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111

1212
namespace CurvaLauncher.Models;
1313

14-
public partial class CurvaLauncherPluginInstance : ObservableObject
14+
public partial class PluginInstance : ObservableObject
1515
{
1616
public IPlugin Plugin { get; }
1717
public Task InitTask { get; private set; } = Task.CompletedTask;
1818

1919

20-
private CurvaLauncherPluginInstance(IPlugin plugin)
20+
private PluginInstance(IPlugin plugin)
2121
{
2222
Plugin = plugin;
2323
if (plugin is II18nPlugin i18nPlugin)
@@ -78,7 +78,7 @@ public async IAsyncEnumerable<IQueryResult> QueryAsync(string query)
7878
}
7979
}
8080

81-
public static bool TryCreate(Type type, [NotNullWhen(true)] out CurvaLauncherPluginInstance? curvaLauncherPlugin)
81+
public static bool TryCreate(Type type, [NotNullWhen(true)] out PluginInstance? curvaLauncherPlugin)
8282
{
8383
curvaLauncherPlugin = null;
8484

@@ -90,9 +90,9 @@ public static bool TryCreate(Type type, [NotNullWhen(true)] out CurvaLauncherPlu
9090
var plugin = Activator.CreateInstance(type, CurvaLauncherContextImpl.Instance);
9191

9292
if (plugin is IAsyncPlugin asyncPlugin)
93-
curvaLauncherPlugin = new CurvaLauncherPluginInstance(asyncPlugin);
93+
curvaLauncherPlugin = new PluginInstance(asyncPlugin);
9494
else if (plugin is ISyncPlugin syncPlugin)
95-
curvaLauncherPlugin = new CurvaLauncherPluginInstance(syncPlugin);
95+
curvaLauncherPlugin = new PluginInstance(syncPlugin);
9696

9797
return curvaLauncherPlugin != null;
9898
}

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
using System.Linq;
33
using System.Text;
44
using System.Threading.Tasks;
5+
using CommunityToolkit.Mvvm.ComponentModel;
56

67
namespace CurvaLauncher.Models.ImmediateResults
78
{
8-
public abstract class ImmediateResult
9+
public abstract class ImmediateResult : ObservableObject
910
{
1011

1112
}

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

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
using System.Collections.Generic;
2+
using System.Linq;
3+
using CommunityToolkit.Mvvm.ComponentModel;
4+
5+
namespace CurvaLauncher.Models.ImmediateResults
6+
{
7+
public partial class MenuResult : ImmediateResult
8+
{
9+
[ObservableProperty]
10+
private int _selectedIndex;
11+
12+
[ObservableProperty]
13+
private QueryResultModel? _selectedItem;
14+
15+
public IReadOnlyList<QueryResultModel> Items { get; }
16+
17+
public MenuResult(PluginInstance pluginInstance, IReadOnlyList<IQueryResult> items)
18+
{
19+
Items = items
20+
.Select(item => new QueryResultModel(pluginInstance, item))
21+
.OrderByDescending(item => item.Weight)
22+
.ToArray();
23+
}
24+
}
25+
}

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

-14
This file was deleted.

0 commit comments

Comments
 (0)