diff --git a/Wox/App.xaml b/Wox/App.xaml index 4f0225e56..814c2d992 100644 --- a/Wox/App.xaml +++ b/Wox/App.xaml @@ -7,6 +7,45 @@ + + + + + + + + + + + + + diff --git a/Wox/MainWindow.xaml.cs b/Wox/MainWindow.xaml.cs index 01e0a65a2..7da040573 100644 --- a/Wox/MainWindow.xaml.cs +++ b/Wox/MainWindow.xaml.cs @@ -41,7 +41,7 @@ namespace Wox InitialTray(); hook.KeyPressed += OnHotKey; - hook.RegisterHotKey(XModifierKeys.Alt, Keys.Space); + hook.RegisterHotKey(XModifierKeys.Win, Keys.W); ThreadPool.SetMaxThreads(30, 10); InitProgressbarAnimation(); try @@ -53,7 +53,6 @@ namespace Wox SetTheme(CommonStorage.Instance.UserSetting.Theme = "Default"); } - Plugins.Init(); } private void WakeupApp() @@ -201,6 +200,7 @@ namespace Wox Top = (SystemParameters.PrimaryScreenHeight - ActualHeight) / 3; //WakeupApp(); + Plugins.Init(); keyboardListener.hookedKeyboardCallback += KListener_hookedKeyboardCallback; } @@ -302,7 +302,7 @@ namespace Wox resultCtrl.AddResults(l); - Debug.WriteLine("Time:" + (Environment.TickCount - t1) + " Count:" + l.Count); + Debug.WriteLine("Total Time:" + (Environment.TickCount - t1) + " Count:" + l.Count); })), TimeSpan.FromMilliseconds(50)); } diff --git a/Wox/ResultPanel.xaml b/Wox/ResultPanel.xaml index 3e0965699..ad039a449 100644 --- a/Wox/ResultPanel.xaml +++ b/Wox/ResultPanel.xaml @@ -44,6 +44,12 @@ + + + + + + diff --git a/Wox/ResultPanel.xaml.cs b/Wox/ResultPanel.xaml.cs index 10413e164..14f61d379 100644 --- a/Wox/ResultPanel.xaml.cs +++ b/Wox/ResultPanel.xaml.cs @@ -1,4 +1,6 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; +using System.Diagnostics; using System.Windows; using System.Windows.Controls; using Wox.Helper; @@ -23,7 +25,6 @@ namespace Wox lbResults.Items.Insert(position, result); } gridContainer.Margin = lbResults.Items.Count > 0 ? new Thickness { Top = 8 } : new Thickness { Top = 0 }; - lbResults.UpdateLayout(); SelectFirst(); } diff --git a/Wox/Themes/Default.xaml b/Wox/Themes/Default.xaml index b4f0546a4..27f6ed242 100644 --- a/Wox/Themes/Default.xaml +++ b/Wox/Themes/Default.xaml @@ -1,16 +1,7 @@  - - - - + + #4F6180 - #543BFD - + + #543BFD - + \ No newline at end of file