Fix issue#32

Wox-launcher · Mar 2, 2014 · 7ae98ca · 7ae98ca
1 parent 13ed55a
commit 7ae98ca
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/Wox.Plugin.System/Programs.cs b/Wox.Plugin.System/Programs.cs
@@ -27,7 +27,6 @@ public class Programs : BaseSystemPlugin
 
         List<Program> installedList = new List<Program>();
 
-
         [DllImport("shell32.dll")]
         static extern bool SHGetSpecialFolderPath(IntPtr hwndOwner,[Out] StringBuilder lpszPath, int nFolder, bool fCreate);
         const int CSIDL_COMMON_STARTMENU = 0x16;  // \Windows\Start Menu\Programs
@@ -40,6 +39,10 @@ protected override List<Result> QueryInternal(Query query)
             var fuzzyMather = FuzzyMatcher.Create(query.RawQuery);
             List<Program> returnList = installedList.Where(o => MatchProgram(o, fuzzyMather)).ToList();
             returnList.ForEach(ScoreFilter);
+            //return ordered list instead of return the score, because programs scores will affect other
+            //plugins, the weight of program should be less than the plugins when they showed at the same time.
+            returnList = returnList.OrderByDescending(o => o.Score).ToList();
+            returnList.ForEach(o=>o.Score = 0);
 
             return returnList.Select(c => new Result()
             {
@@ -112,7 +115,6 @@ private void GetAppFromDirectory(string path)
                     {
                         Title = getAppNameFromAppPath(file),
                         IcoPath = file,
-                        Score = 10,
                         ExecutePath = file
                     };
                     installedList.Add(p);
@@ -129,11 +131,11 @@ private void ScoreFilter(Program p)
         {
             if (p.Title.Contains("启动") || p.Title.ToLower().Contains("start"))
             {
-                p.Score += 10;
+                p.Score += 1;
             }
             if (p.Title.Contains("卸载") || p.Title.ToLower().Contains("uninstall"))
             {
-                p.Score -= 5;
+                p.Score -= 1;
             }
         }
 

diff --git a/Wox.Plugin.System/Setting.cs b/Wox.Plugin.System/Setting.cs
@@ -16,7 +16,7 @@ protected override List<Result> QueryInternal(Query query)
                 results.Add(new Result()
                 {
                     Title = "Wox Setting",
-                    Score = 100,
+                    Score = 40,
                     IcoPath = "Images/app.png",
                     Action = (contenxt) =>
                     {

diff --git a/Wox.Plugin.System/WebSearchPlugin.cs b/Wox.Plugin.System/WebSearchPlugin.cs
@@ -25,6 +25,7 @@ protected override List<Result> QueryInternal(Query query)
                 results.Add(new Result()
                 {
                     Title = string.Format("Search {0} for \"{1}\"", webSearch.Title, keyword),
+                    Score = 6,
                     IcoPath = webSearch.IconPath,
                     Action = (c) =>
                     {

diff --git a/Wox/ResultPanel.xaml b/Wox/ResultPanel.xaml
@@ -40,7 +40,7 @@
                                 <RowDefinition></RowDefinition>
                                 <RowDefinition Height="Auto" x:Name="SubTitleRowDefinition"></RowDefinition>
                             </Grid.RowDefinitions>
-                            <TextBlock Style="{DynamicResource ItemTitleStyle}" ToolTip="{Binding Title}" x:Name="tbTitle" Text="{Binding Title}"></TextBlock>
+                            <TextBlock Style="{DynamicResource ItemTitleStyle}" VerticalAlignment="Center" ToolTip="{Binding Title}" x:Name="tbTitle" Text="{Binding Title}"></TextBlock>
                             <TextBlock Style="{DynamicResource ItemSubTitleStyle}" Visibility="{Binding SubTitle, Converter={wox:StringNullOrEmptyToVisibilityConverter}}" Grid.Row="1" x:Name="tbSubTitle" Text="{Binding SubTitle}"></TextBlock>
                         </Grid>
                     </Grid>