From 200181623ec75aa9d4913f1d6bd072db9071a584 Mon Sep 17 00:00:00 2001
From: qianlifeng <qianlf2008@163.com>
Date: Sun, 9 Mar 2014 17:01:39 +0800
Subject: [PATCH] Fix issues#33

---
 Wox/MainWindow.xaml.cs  |  7 ++++---
 Wox/Themes/Default.xaml | 10 ++++------
 Wox/Themes/Light.xaml   |  4 +---
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/Wox/MainWindow.xaml.cs b/Wox/MainWindow.xaml.cs
index bd061dbef2..80f2f2482a 100644
--- a/Wox/MainWindow.xaml.cs
+++ b/Wox/MainWindow.xaml.cs
@@ -59,6 +59,9 @@ namespace Wox
             {
                 SetTheme(CommonStorage.Instance.UserSetting.Theme = "Default");
             }
+
+            SetHotkey(CommonStorage.Instance.UserSetting.Hotkey, OnHotkey);
+            SetCustomPluginHotkey();
         }
 
         public void SetHotkey(string hotkeyStr, EventHandler<HotkeyEventArgs> action)
@@ -220,9 +223,7 @@ namespace Wox
             Left = (SystemParameters.PrimaryScreenWidth - ActualWidth) / 2;
             Top = (SystemParameters.PrimaryScreenHeight - ActualHeight) / 3;
 
-            SetHotkey(CommonStorage.Instance.UserSetting.Hotkey, OnHotkey);
-            SetCustomPluginHotkey();
-            //WakeupApp();
+
             Plugins.Init();
 
             globalHotkey.hookedKeyboardCallback += KListener_hookedKeyboardCallback;
diff --git a/Wox/Themes/Default.xaml b/Wox/Themes/Default.xaml
index 61447daf51..f2cf08c585 100644
--- a/Wox/Themes/Default.xaml
+++ b/Wox/Themes/Default.xaml
@@ -46,16 +46,14 @@
     <Style x:Key="listboxStyle" TargetType="{x:Type ListBox}">
         <Setter Property="BorderBrush" Value="Transparent"/>
         <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="OverridesDefaultStyle" Value="true"/>
-        <Setter Property="OverridesDefaultStyle" Value="true"/>
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ListBox">
-                    <ScrollViewer Focusable="false" Template="{DynamicResource ScrollViewerControlTemplate}">
-                            <StackPanel IsItemsHost="True" />
-                        </ScrollViewer>
+                <ScrollViewer Focusable="false" Template="{DynamicResource ScrollViewerControlTemplate}">
+                    <VirtualizingStackPanel IsItemsHost="True" />
+                </ScrollViewer>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -133,4 +131,4 @@
         </Setter>
 
     </Style>
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>
diff --git a/Wox/Themes/Light.xaml b/Wox/Themes/Light.xaml
index 28c8f9f914..6e6b6bd626 100644
--- a/Wox/Themes/Light.xaml
+++ b/Wox/Themes/Light.xaml
@@ -46,15 +46,13 @@
     <Style x:Key="listboxStyle" TargetType="{x:Type ListBox}">
         <Setter Property="BorderBrush" Value="Transparent"/>
         <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="OverridesDefaultStyle" Value="true"/>
-        <Setter Property="OverridesDefaultStyle" Value="true"/>
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ListBox">
                     <ScrollViewer Focusable="false" Template="{DynamicResource ScrollViewerControlTemplate}">
-                        <StackPanel IsItemsHost="True" />
+                        <VirtualizingStackPanel IsItemsHost="True" />
                     </ScrollViewer>
                 </ControlTemplate>
             </Setter.Value>