diff --git a/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml b/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml index 82b6c09e44..372c1c49ec 100644 --- a/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml +++ b/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml @@ -415,15 +415,13 @@ - - - + - + @@ -443,9 +441,9 @@ - + - + @@ -478,7 +476,7 @@ - + diff --git a/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml.cs b/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml.cs index 245ea2c5ff..b580483341 100644 --- a/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml.cs +++ b/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml.cs @@ -1,17 +1,4 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; -using Windows.Foundation; -using Windows.Foundation.Collections; -using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Controls.Primitives; -using Windows.UI.Xaml.Data; -using Windows.UI.Xaml.Input; -using Windows.UI.Xaml.Media; -using Windows.UI.Xaml.Navigation; namespace PowerLauncher.UI { @@ -20,7 +7,7 @@ namespace PowerLauncher.UI public LauncherControl() { this.InitializeComponent(); - ShellBarShadow.Receivers.Add(ShadowReceiverGrid); + ShellBarShadow.Receivers.Add(ShadowReceiverGrid); } } -} +} \ No newline at end of file diff --git a/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs b/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs index 7b96a516e4..668fdeba85 100644 --- a/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs +++ b/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs @@ -18,6 +18,9 @@ using KeyEventArgs = System.Windows.Input.KeyEventArgs; using MessageBox = System.Windows.MessageBox; using Microsoft.Toolkit.Wpf.UI.XamlHost; using Windows.UI.Xaml.Controls; +using System.Diagnostics; +using Wox.Plugin; +using Windows.UI.Xaml.Input; namespace PowerLauncher { @@ -133,6 +136,8 @@ namespace PowerLauncher // } //} + + private void OnDrop(object sender, DragEventArgs e) { @@ -256,9 +261,8 @@ namespace PowerLauncher _launcher = (PowerLauncher.UI.LauncherControl)host.Child; _launcher.DataContext = _viewModel; _launcher.SearchBox.TextChanged += QueryTextBox_TextChanged; - + _launcher.SearchBox.QuerySubmitted += AutoSuggestBox_QuerySubmitted; _launcher.SearchBox.Focus(Windows.UI.Xaml.FocusState.Programmatic); - _viewModel.PropertyChanged += (o, e) => { if (e.PropertyName == nameof(MainViewModel.MainWindowVisibility)) @@ -277,14 +281,21 @@ namespace PowerLauncher } }; } + + private void AutoSuggestBox_QuerySubmitted(AutoSuggestBox sender, AutoSuggestBoxQuerySubmittedEventArgs args) + { + if (args != null && args.ChosenSuggestion != null) + { + ResultViewModel result = (ResultViewModel)args.ChosenSuggestion; + _ = result.Result.Action != null && result.Result.Action(new ActionContext { }); + } + } + private void QueryTextBox_TextChanged(Windows.UI.Xaml.Controls.AutoSuggestBox sender, Windows.UI.Xaml.Controls.AutoSuggestBoxTextChangedEventArgs args) { if (args.Reason == AutoSuggestionBoxTextChangeReason.UserInput) { - if (_viewModel.QueryTextCursorMovedToEnd) - { - _viewModel.QueryTextCursorMovedToEnd = false; - } + _viewModel.QueryText = sender.Text; } } } diff --git a/src/modules/launcher/Wox/ViewModel/ResultViewModel.cs b/src/modules/launcher/Wox/ViewModel/ResultViewModel.cs index 1d610db2fe..54a340dd24 100644 --- a/src/modules/launcher/Wox/ViewModel/ResultViewModel.cs +++ b/src/modules/launcher/Wox/ViewModel/ResultViewModel.cs @@ -64,8 +64,7 @@ namespace Wox.ViewModel public override string ToString() { - return Result.ToString(); + return Result.Title.ToString(); } - } }