From b6f927c454b7e3d8d85fe86c521fa61751e07d35 Mon Sep 17 00:00:00 2001 From: Divyansh Date: Thu, 2 Apr 2020 18:08:02 -0700 Subject: [PATCH 1/7] Added callback function for mouse click on search result --- .../PowerLauncher.UI/LauncherControl.xaml | 2 +- .../launcher/PowerLauncher/MainWindow.xaml.cs | 15 ++++++++++++++- .../launcher/Wox/ViewModel/ResultViewModel.cs | 1 - 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml b/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml index 82b6c09e44..aa1c83c3db 100644 --- a/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml +++ b/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml @@ -418,7 +418,7 @@ + Text="{Binding QueryText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" ItemsSource="{Binding Results.Results}"> diff --git a/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs b/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs index 7b96a516e4..9c5dd90288 100644 --- a/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs +++ b/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs @@ -18,6 +18,7 @@ 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; namespace PowerLauncher { @@ -133,6 +134,8 @@ namespace PowerLauncher // } //} + + private void OnDrop(object sender, DragEventArgs e) { @@ -256,7 +259,7 @@ namespace PowerLauncher _launcher = (PowerLauncher.UI.LauncherControl)host.Child; _launcher.DataContext = _viewModel; _launcher.SearchBox.TextChanged += QueryTextBox_TextChanged; - + _launcher.SearchBox.SuggestionChosen += SearchBox_SuggestionChosen; _launcher.SearchBox.Focus(Windows.UI.Xaml.FocusState.Programmatic); _viewModel.PropertyChanged += (o, e) => @@ -277,6 +280,16 @@ namespace PowerLauncher } }; } + + private void SearchBox_SuggestionChosen(AutoSuggestBox sender, AutoSuggestBoxSuggestionChosenEventArgs args) + { + if (args != null) + { + ResultViewModel result = (ResultViewModel)args.SelectedItem; + Process.Start(result.Result.SubTitle); + } + } + private void QueryTextBox_TextChanged(Windows.UI.Xaml.Controls.AutoSuggestBox sender, Windows.UI.Xaml.Controls.AutoSuggestBoxTextChangedEventArgs args) { if (args.Reason == AutoSuggestionBoxTextChangeReason.UserInput) diff --git a/src/modules/launcher/Wox/ViewModel/ResultViewModel.cs b/src/modules/launcher/Wox/ViewModel/ResultViewModel.cs index 1d610db2fe..fd36f58dc0 100644 --- a/src/modules/launcher/Wox/ViewModel/ResultViewModel.cs +++ b/src/modules/launcher/Wox/ViewModel/ResultViewModel.cs @@ -66,6 +66,5 @@ namespace Wox.ViewModel { return Result.ToString(); } - } } From 293a8a8199e24a6bfb7ee7eee02146065a073666 Mon Sep 17 00:00:00 2001 From: Divyansh Date: Fri, 3 Apr 2020 12:02:57 -0700 Subject: [PATCH 2/7] Working App execution --- src/modules/launcher/PowerLauncher/MainWindow.xaml.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs b/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs index 9c5dd90288..17b41bb6ab 100644 --- a/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs +++ b/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs @@ -19,6 +19,7 @@ using MessageBox = System.Windows.MessageBox; using Microsoft.Toolkit.Wpf.UI.XamlHost; using Windows.UI.Xaml.Controls; using System.Diagnostics; +using Wox.Plugin; namespace PowerLauncher { @@ -286,7 +287,14 @@ namespace PowerLauncher if (args != null) { ResultViewModel result = (ResultViewModel)args.SelectedItem; - Process.Start(result.Result.SubTitle); + bool hideWindow = result.Result.Action != null && result.Result.Action(new ActionContext + { + + }); + if (!hideWindow) + { + Console.WriteLine("here"); + } } } From 1a15a062ef38c6ac242ed59b29476f235a3ade6f Mon Sep 17 00:00:00 2001 From: Divyansh Date: Fri, 3 Apr 2020 14:45:02 -0700 Subject: [PATCH 3/7] Working up/down arrow key --- .../PowerLauncher.UI/LauncherControl.xaml | 9 ++--- .../PowerLauncher.UI/LauncherControl.xaml.cs | 17 +------- .../launcher/PowerLauncher/MainWindow.xaml.cs | 40 +++++++++---------- 3 files changed, 26 insertions(+), 40 deletions(-) diff --git a/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml b/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml index aa1c83c3db..ee195d12f3 100644 --- a/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml +++ b/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml @@ -415,10 +415,9 @@ - - - + @@ -443,7 +442,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 17b41bb6ab..72f110c5d0 100644 --- a/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs +++ b/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs @@ -260,26 +260,26 @@ namespace PowerLauncher _launcher = (PowerLauncher.UI.LauncherControl)host.Child; _launcher.DataContext = _viewModel; _launcher.SearchBox.TextChanged += QueryTextBox_TextChanged; - _launcher.SearchBox.SuggestionChosen += SearchBox_SuggestionChosen; - _launcher.SearchBox.Focus(Windows.UI.Xaml.FocusState.Programmatic); + //_launcher.SearchBox.SuggestionChosen += SearchBox_SuggestionChosen; + //_launcher.SearchBox.Focus(Windows.UI.Xaml.FocusState.Programmatic); - _viewModel.PropertyChanged += (o, e) => - { - if (e.PropertyName == nameof(MainViewModel.MainWindowVisibility)) - { - if (Visibility == System.Windows.Visibility.Visible) - { - Activate(); - _launcher.SearchBox.Focus(Windows.UI.Xaml.FocusState.Programmatic); - UpdatePosition(); - _settings.ActivateTimes++; - if (!_viewModel.LastQuerySelected) - { - _viewModel.LastQuerySelected = true; - } - } - } - }; + //_viewModel.PropertyChanged += (o, e) => + //{ + // if (e.PropertyName == nameof(MainViewModel.MainWindowVisibility)) + // { + // if (Visibility == System.Windows.Visibility.Visible) + // { + // Activate(); + // _launcher.SearchBox.Focus(Windows.UI.Xaml.FocusState.Programmatic); + // UpdatePosition(); + // _settings.ActivateTimes++; + // if (!_viewModel.LastQuerySelected) + // { + // _viewModel.LastQuerySelected = true; + // } + // } + // } + //}; } private void SearchBox_SuggestionChosen(AutoSuggestBox sender, AutoSuggestBoxSuggestionChosenEventArgs args) @@ -295,7 +295,7 @@ namespace PowerLauncher { Console.WriteLine("here"); } - } + } } private void QueryTextBox_TextChanged(Windows.UI.Xaml.Controls.AutoSuggestBox sender, Windows.UI.Xaml.Controls.AutoSuggestBoxTextChangedEventArgs args) From abbaca3c711b142b6ef15a6e789fc12e3076ad06 Mon Sep 17 00:00:00 2001 From: Divyansh Date: Mon, 6 Apr 2020 09:23:08 -0700 Subject: [PATCH 4/7] Updated functionality on suggestion chosen in autosuggestbox --- .../launcher/PowerLauncher/MainWindow.xaml.cs | 49 ++++++++----------- 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs b/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs index 72f110c5d0..bc2802c403 100644 --- a/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs +++ b/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs @@ -260,26 +260,26 @@ namespace PowerLauncher _launcher = (PowerLauncher.UI.LauncherControl)host.Child; _launcher.DataContext = _viewModel; _launcher.SearchBox.TextChanged += QueryTextBox_TextChanged; - //_launcher.SearchBox.SuggestionChosen += SearchBox_SuggestionChosen; - //_launcher.SearchBox.Focus(Windows.UI.Xaml.FocusState.Programmatic); + _launcher.SearchBox.SuggestionChosen += SearchBox_SuggestionChosen; + _launcher.SearchBox.Focus(Windows.UI.Xaml.FocusState.Programmatic); - //_viewModel.PropertyChanged += (o, e) => - //{ - // if (e.PropertyName == nameof(MainViewModel.MainWindowVisibility)) - // { - // if (Visibility == System.Windows.Visibility.Visible) - // { - // Activate(); - // _launcher.SearchBox.Focus(Windows.UI.Xaml.FocusState.Programmatic); - // UpdatePosition(); - // _settings.ActivateTimes++; - // if (!_viewModel.LastQuerySelected) - // { - // _viewModel.LastQuerySelected = true; - // } - // } - // } - //}; + _viewModel.PropertyChanged += (o, e) => + { + if (e.PropertyName == nameof(MainViewModel.MainWindowVisibility)) + { + if (Visibility == System.Windows.Visibility.Visible) + { + Activate(); + _launcher.SearchBox.Focus(Windows.UI.Xaml.FocusState.Programmatic); + UpdatePosition(); + _settings.ActivateTimes++; + if (!_viewModel.LastQuerySelected) + { + _viewModel.LastQuerySelected = true; + } + } + } + }; } private void SearchBox_SuggestionChosen(AutoSuggestBox sender, AutoSuggestBoxSuggestionChosenEventArgs args) @@ -287,15 +287,8 @@ namespace PowerLauncher if (args != null) { ResultViewModel result = (ResultViewModel)args.SelectedItem; - bool hideWindow = result.Result.Action != null && result.Result.Action(new ActionContext - { - - }); - if (!hideWindow) - { - Console.WriteLine("here"); - } - } + _ = 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) From 553922bef6788014d99ad7ecf1f7651937443aa4 Mon Sep 17 00:00:00 2001 From: Divyansh Date: Mon, 6 Apr 2020 16:08:31 -0700 Subject: [PATCH 5/7] Added query submitted event to handle default action on clicking a list view item --- .../PowerLauncher.UI/LauncherControl.xaml | 4 ++-- .../launcher/PowerLauncher/MainWindow.xaml.cs | 20 ++++++++++++++----- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml b/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml index ee195d12f3..3e5ca01fde 100644 --- a/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml +++ b/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml @@ -422,7 +422,7 @@ - + @@ -442,7 +442,7 @@ - + diff --git a/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs b/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs index bc2802c403..340ee0297f 100644 --- a/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs +++ b/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs @@ -20,6 +20,7 @@ using Microsoft.Toolkit.Wpf.UI.XamlHost; using Windows.UI.Xaml.Controls; using System.Diagnostics; using Wox.Plugin; +using Windows.UI.Xaml.Input; namespace PowerLauncher { @@ -260,9 +261,9 @@ namespace PowerLauncher _launcher = (PowerLauncher.UI.LauncherControl)host.Child; _launcher.DataContext = _viewModel; _launcher.SearchBox.TextChanged += QueryTextBox_TextChanged; - _launcher.SearchBox.SuggestionChosen += SearchBox_SuggestionChosen; + _launcher.SearchBox.SuggestionChosen += AutoSuggestBox_SuggestionChosen; + _launcher.SearchBox.QuerySubmitted += AutoSuggestBox_QuerySubmitted; _launcher.SearchBox.Focus(Windows.UI.Xaml.FocusState.Programmatic); - _viewModel.PropertyChanged += (o, e) => { if (e.PropertyName == nameof(MainViewModel.MainWindowVisibility)) @@ -282,12 +283,21 @@ namespace PowerLauncher }; } - private void SearchBox_SuggestionChosen(AutoSuggestBox sender, AutoSuggestBoxSuggestionChosenEventArgs args) + private void AutoSuggestBox_SuggestionChosen(AutoSuggestBox sender, AutoSuggestBoxSuggestionChosenEventArgs args) { - if (args != null) + if(args != null && args.SelectedItem != null) { ResultViewModel result = (ResultViewModel)args.SelectedItem; - _ = result.Result.Action != null && result.Result.Action(new ActionContext{}); + sender.Text = result.Result.Title; + } + } + + 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 { }); } } From dc0715dc2ab19d66a3a02f2eab359dd52dce313b Mon Sep 17 00:00:00 2001 From: Divyansh Date: Mon, 6 Apr 2020 17:38:48 -0700 Subject: [PATCH 6/7] Rectyfying title display --- .../PowerLauncher.UI/LauncherControl.xaml | 7 +++---- .../launcher/PowerLauncher/MainWindow.xaml.cs | 15 +-------------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml b/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml index 3e5ca01fde..494c0be175 100644 --- a/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml +++ b/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml @@ -416,8 +416,7 @@ + MinWidth="720" ItemsSource="{Binding Results.Results}" TextMemberPath="Title"> @@ -444,7 +443,7 @@ - + @@ -477,7 +476,7 @@ - + diff --git a/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs b/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs index 340ee0297f..668fdeba85 100644 --- a/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs +++ b/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs @@ -261,7 +261,6 @@ namespace PowerLauncher _launcher = (PowerLauncher.UI.LauncherControl)host.Child; _launcher.DataContext = _viewModel; _launcher.SearchBox.TextChanged += QueryTextBox_TextChanged; - _launcher.SearchBox.SuggestionChosen += AutoSuggestBox_SuggestionChosen; _launcher.SearchBox.QuerySubmitted += AutoSuggestBox_QuerySubmitted; _launcher.SearchBox.Focus(Windows.UI.Xaml.FocusState.Programmatic); _viewModel.PropertyChanged += (o, e) => @@ -283,15 +282,6 @@ namespace PowerLauncher }; } - private void AutoSuggestBox_SuggestionChosen(AutoSuggestBox sender, AutoSuggestBoxSuggestionChosenEventArgs args) - { - if(args != null && args.SelectedItem != null) - { - ResultViewModel result = (ResultViewModel)args.SelectedItem; - sender.Text = result.Result.Title; - } - } - private void AutoSuggestBox_QuerySubmitted(AutoSuggestBox sender, AutoSuggestBoxQuerySubmittedEventArgs args) { if (args != null && args.ChosenSuggestion != null) @@ -305,10 +295,7 @@ namespace PowerLauncher { if (args.Reason == AutoSuggestionBoxTextChangeReason.UserInput) { - if (_viewModel.QueryTextCursorMovedToEnd) - { - _viewModel.QueryTextCursorMovedToEnd = false; - } + _viewModel.QueryText = sender.Text; } } } From 9ddee84954f5116e207e180461b4ecb5f882da25 Mon Sep 17 00:00:00 2001 From: Divyansh Date: Mon, 6 Apr 2020 18:01:59 -0700 Subject: [PATCH 7/7] Title display working correctly --- src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml | 2 +- src/modules/launcher/Wox/ViewModel/ResultViewModel.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml b/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml index 494c0be175..372c1c49ec 100644 --- a/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml +++ b/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml @@ -416,7 +416,7 @@ + MinWidth="720" ItemsSource="{Binding Results.Results}"> diff --git a/src/modules/launcher/Wox/ViewModel/ResultViewModel.cs b/src/modules/launcher/Wox/ViewModel/ResultViewModel.cs index fd36f58dc0..54a340dd24 100644 --- a/src/modules/launcher/Wox/ViewModel/ResultViewModel.cs +++ b/src/modules/launcher/Wox/ViewModel/ResultViewModel.cs @@ -64,7 +64,7 @@ namespace Wox.ViewModel public override string ToString() { - return Result.ToString(); + return Result.Title.ToString(); } } }