diff --git a/src/modules/launcher/PowerLauncher.UI/App.xaml b/src/modules/launcher/PowerLauncher.UI/App.xaml
index d40a829ba0..9c14783f81 100644
--- a/src/modules/launcher/PowerLauncher.UI/App.xaml
+++ b/src/modules/launcher/PowerLauncher.UI/App.xaml
@@ -12,23 +12,17 @@
+ #FFf2f1f2
-
-
-
-
- #FF979797
- 8
+
+
-
-
-
-
- 8
- #FF979797
+ #FF484848
+
+
@@ -42,7 +36,7 @@
-
-
\ No newline at end of file
diff --git a/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml b/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml
index 6db4be5db7..7a72b39db4 100644
--- a/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml
+++ b/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml
@@ -15,7 +15,7 @@
-
+
@@ -26,156 +26,15 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
@@ -191,16 +50,11 @@
-
-
-
@@ -210,14 +64,7 @@
-
-
@@ -227,62 +74,19 @@
-
-
-
-
-
-
-
-
-
-
- Visible
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
@@ -352,35 +124,47 @@
-
+
+
+
+
+
+ />
-
+
+
+
\ No newline at end of file
diff --git a/src/modules/launcher/PowerLauncher.UI/ResultList.xaml b/src/modules/launcher/PowerLauncher.UI/ResultList.xaml
index 904c9aa816..df505cd174 100644
--- a/src/modules/launcher/PowerLauncher.UI/ResultList.xaml
+++ b/src/modules/launcher/PowerLauncher.UI/ResultList.xaml
@@ -43,8 +43,8 @@
+ Style="{StaticResource ListViewNoAnimations}">
-
+
@@ -81,7 +80,7 @@
-
+
-
+
-
+
{
@@ -172,16 +172,16 @@ namespace PowerLauncher
}
// to select the text so that the user can continue to type
- if(!String.IsNullOrEmpty(_launcher.TextBox.Text))
+ if(!String.IsNullOrEmpty(_launcher.QueryTextBox.Text))
{
- _launcher.TextBox.SelectAll();
+ _launcher.QueryTextBox.SelectAll();
}
}
}
else if(e.PropertyName == nameof(MainViewModel.SystemQueryText))
{
this._isTextSetProgramatically = true;
- _launcher.TextBox.Text = _viewModel.SystemQueryText;
+ _launcher.QueryTextBox.Text = _viewModel.SystemQueryText;
}
};
}
@@ -319,31 +319,7 @@ namespace PowerLauncher
// To populate the AutoCompleteTextBox as soon as the selection is changed or set.
// Setting it here instead of when the text is changed as there is a delay in executing the query and populating the result
- _launcher.AutoCompleteTextBox.PlaceholderText = ListView_FirstItem(_viewModel.QueryText);
-
- }
-
- private void ResultsList_ItemClick(object sender, ItemClickEventArgs e)
- {
- ResultViewModel result = e?.ClickedItem as ResultViewModel;
- if(result != null)
- {
- _viewModel.Results.SelectedItem = result;
- _viewModel.OpenResultCommand.Execute(null);
- }
- }
-
- private void AutoSuggestBox_QuerySubmitted(AutoSuggestBox sender, AutoSuggestBoxQuerySubmittedEventArgs args)
- {
- if (args != null && args.ChosenSuggestion != null)
- {
- ResultViewModel result = (ResultViewModel)args.ChosenSuggestion;
- if (result != null)
- {
- _viewModel.Results.SelectedItem = result;
- _viewModel.OpenResultCommand.Execute(null);
- }
- }
+ _launcher.AutoCompleteTextBlock.Text = ListView_FirstItem(_viewModel.QueryText);
}
private const int millisecondsToWait = 200;
@@ -373,18 +349,18 @@ namespace PowerLauncher
if(this._isTextSetProgramatically)
{
- this._launcher.TextBox.TextChanged += QueryTextBox_TextChangedProgramatically;
+ this._launcher.QueryTextBox.TextChanged += QueryTextBox_TextChangedProgramatically;
}
else
{
- this._launcher.TextBox.TextChanged += QueryTextBox_TextChangedByUserInput;
+ this._launcher.QueryTextBox.TextChanged += QueryTextBox_TextChangedByUserInput;
}
}
private void ClearAllQueryTextChangedHanlders()
{
- this._launcher.TextBox.TextChanged -= QueryTextBox_TextChangedProgramatically;
- this._launcher.TextBox.TextChanged -= QueryTextBox_TextChangedByUserInput;
+ this._launcher.QueryTextBox.TextChanged -= QueryTextBox_TextChangedProgramatically;
+ this._launcher.QueryTextBox.TextChanged -= QueryTextBox_TextChangedByUserInput;
}
private void QueryTextBox_TextChangedProgramatically(object sender, Windows.UI.Xaml.Controls.TextChangedEventArgs e)
@@ -402,7 +378,7 @@ namespace PowerLauncher
//To clear the auto-suggest immediately instead of waiting for selection changed
if (text == String.Empty)
{
- _launcher.AutoCompleteTextBox.PlaceholderText = String.Empty;
+ _launcher.AutoCompleteTextBlock.Text = String.Empty;
}
_viewModel.QueryText = text;
@@ -424,7 +400,7 @@ namespace PowerLauncher
}
}
-private void WindowsXamlHost_PreviewMouseDown(object sender, MouseButtonEventArgs e)
+ private void WindowsXamlHost_PreviewMouseDown(object sender, MouseButtonEventArgs e)
{
// if (sender != null && e.OriginalSource != null)
// {