diff --git a/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml b/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml index 7a72b39db4..7665796629 100644 --- a/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml +++ b/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml @@ -5,8 +5,6 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" - ActualThemeChanged="UserControl_ActualThemeChanged" - Loaded="UserControl_Loaded" d:DesignHeight="300" d:DesignWidth="720"> diff --git a/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml.cs b/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml.cs index 1713974da9..3a0838f092 100644 --- a/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml.cs +++ b/src/modules/launcher/PowerLauncher.UI/LauncherControl.xaml.cs @@ -1,50 +1,12 @@ -using System.ComponentModel; -using System.Diagnostics; -using System.Runtime.CompilerServices; -using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Media; namespace PowerLauncher.UI { - public sealed partial class LauncherControl : UserControl, INotifyPropertyChanged + public sealed partial class LauncherControl : UserControl { - private Brush _borderBrush; - public LauncherControl() { InitializeComponent(); } - - public Brush SolidBorderBrush - { - get { return _borderBrush; } - set { Set(ref _borderBrush, value); } - } - - private void Set(ref T storage, T value, [CallerMemberName]string propertyName = null) - { - if (Equals(storage, value)) - { - return; - } - - storage = value; - OnPropertyChanged(propertyName); - } - - private void UserControl_ActualThemeChanged(FrameworkElement sender, object args) - { - SolidBorderBrush = Application.Current.Resources["SystemChromeLow"] as SolidColorBrush; - } - - private void UserControl_Loaded(object sender, RoutedEventArgs e) - { - SolidBorderBrush = Application.Current.Resources["SystemChromeLow"] as SolidColorBrush; - } - - public event PropertyChangedEventHandler PropertyChanged; - - private void OnPropertyChanged(string propertyName) => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); } } \ 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 d00f60f1e8..0d26461f78 100644 --- a/src/modules/launcher/PowerLauncher.UI/ResultList.xaml +++ b/src/modules/launcher/PowerLauncher.UI/ResultList.xaml @@ -5,7 +5,6 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" - xmlns:ToolkitBehaviors="using:Microsoft.Toolkit.Uwp.UI.Animations.Behaviors" xmlns:Core="using:Microsoft.Xaml.Interactions.Core" xmlns:Interactivity="using:Microsoft.Xaml.Interactivity" xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters" diff --git a/src/modules/launcher/PowerLauncher/App.xaml.cs b/src/modules/launcher/PowerLauncher/App.xaml.cs index f996f62995..25cfccc8c0 100644 --- a/src/modules/launcher/PowerLauncher/App.xaml.cs +++ b/src/modules/launcher/PowerLauncher/App.xaml.cs @@ -94,7 +94,7 @@ namespace PowerLauncher _settingsWatcher = new SettingsWatcher(_settings); - _mainVM.MainWindowVisibility = Visibility.Visible; + _mainVM.MainWindowVisibility = Visibility.Hidden; Log.Info("|App.OnStartup|End Wox startup ---------------------------------------------------- "); bootTime.Stop(); diff --git a/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs b/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs index 820c888655..2aaafd0f4e 100644 --- a/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs +++ b/src/modules/launcher/PowerLauncher/MainWindow.xaml.cs @@ -282,7 +282,9 @@ namespace PowerLauncher this.SearchBoxBorder.BorderBrush = solidBorderBrush; this.SearchBoxBorder.Background = solidBorderBrush; - + this.ListBoxBorder.BorderBrush = solidBorderBrush; + this.ListBoxBorder.Background = solidBorderBrush; + } } else if(e.PropertyName == "PrimaryTextColor")