Skip to content

Commit cd79a2a

Browse files
onesoundsonesounds
authored
Merge branch 'dev' into clock
2 parents e4fddab + 32a0195 commit cd79a2a

File tree

27 files changed

+210
-88
lines changed

27 files changed

+210
-88
lines changed

‎Flow.Launcher.Core/Plugin/PluginManager.cs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -166,18 +166,18 @@ public static async Task InitializePluginsAsync(IPublicAPI api)
166166

167167
public static ICollection<PluginPair> ValidPluginsForQuery(Query query)
168168
{
169-
if (NonGlobalPlugins.ContainsKey(query.ActionKeyword))
170-
{
171-
var plugin = NonGlobalPlugins[query.ActionKeyword];
172-
return new List<PluginPair>
173-
{
174-
plugin
175-
};
176-
}
177-
else
178-
{
169+
if (query is null)
170+
return Array.Empty<PluginPair>();
171+
172+
if (!NonGlobalPlugins.ContainsKey(query.ActionKeyword))
179173
return GlobalPlugins;
180-
}
174+
175+
176+
var plugin = NonGlobalPlugins[query.ActionKeyword];
177+
return new List<PluginPair>
178+
{
179+
plugin
180+
};
181181
}
182182

183183
public static async Task<List<Result>> QueryForPluginAsync(PluginPair pair, Query query, CancellationToken token)

‎Flow.Launcher.Core/Resource/Theme.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace Flow.Launcher.Core.Resource
1717
{
1818
public class Theme
1919
{
20-
private const int ShadowExtraMargin = 12;
20+
private const int ShadowExtraMargin = 32;
2121

2222
private readonly List<string> _themeDirectories = new List<string>();
2323
private ResourceDictionary _oldResource;
@@ -238,9 +238,10 @@ public void AddDropShadowEffectToCurrentTheme()
238238
Property = Border.EffectProperty,
239239
Value = new DropShadowEffect
240240
{
241-
Opacity = 0.4,
242-
ShadowDepth = 2,
243-
BlurRadius = 15
241+
Opacity = 0.3,
242+
ShadowDepth = 12,
243+
Direction = 270,
244+
BlurRadius = 30
244245
}
245246
};
246247

@@ -250,7 +251,7 @@ public void AddDropShadowEffectToCurrentTheme()
250251
marginSetter = new Setter()
251252
{
252253
Property = Border.MarginProperty,
253-
Value = new Thickness(ShadowExtraMargin),
254+
Value = new Thickness(ShadowExtraMargin, 12, ShadowExtraMargin, ShadowExtraMargin),
254255
};
255256
windowBorderStyle.Setters.Add(marginSetter);
256257
}

‎Flow.Launcher/Languages/en.xaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
<system:String x:Key="selectPythonDirectory">Select</system:String>
5353
<system:String x:Key="hideOnStartup">Hide Flow Launcher on startup</system:String>
5454
<system:String x:Key="hideNotifyIcon">Hide tray icon</system:String>
55+
<system:String x:Key="hideNotifyIconToolTip">When the icon is hidden from the tray, the Settings menu can be opened by right-clicking on the search window.</system:String>
5556
<system:String x:Key="querySearchPrecision">Query Search Precision</system:String>
5657
<system:String x:Key="querySearchPrecisionToolTip">Changes minimum match score required for results.</system:String>
5758
<system:String x:Key="ShouldUsePinyin">Should Use Pinyin</system:String>
@@ -71,6 +72,7 @@
7172
<system:String x:Key="currentPriority">Current Priority</system:String>
7273
<system:String x:Key="newPriority">New Priority</system:String>
7374
<system:String x:Key="priority">Priority</system:String>
75+
<system:String x:Key="priorityToolTip">Change Plugin Results Priority</system:String>
7476
<system:String x:Key="pluginDirectory">Plugin Directory</system:String>
7577
<system:String x:Key="author">by</system:String>
7678
<system:String x:Key="plugin_init_time">Init time:</system:String>

‎Flow.Launcher/Languages/es-419.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
<system:String x:Key="currentPriority">Prioridad Actual</system:String>
7070
<system:String x:Key="newPriority">Nueva Prioridad</system:String>
7171
<system:String x:Key="priority">Prioridad</system:String>
72+
<system:String x:Key="priorityToolTip">Cambiar la prioridad del resultado del plugin</system:String>
7273
<system:String x:Key="pluginDirectory">Directorio de Plugins</system:String>
7374
<system:String x:Key="author">por</system:String>
7475
<system:String x:Key="plugin_init_time">Tiempo de inicio:</system:String>

‎Flow.Launcher/Languages/es.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
<system:String x:Key="currentPriority">Prioridad actual</system:String>
7070
<system:String x:Key="newPriority">Nueva prioridad</system:String>
7171
<system:String x:Key="priority">Prioridad</system:String>
72+
<system:String x:Key="priorityToolTip">Cambiar la prioridad del resultado del complemento</system:String>
7273
<system:String x:Key="pluginDirectory">Carpeta de complementos</system:String>
7374
<system:String x:Key="author">por</system:String>
7475
<system:String x:Key="plugin_init_time">Tiempo de inicio:</system:String>

‎Flow.Launcher/Languages/ko.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
<system:String x:Key="currentPriority">현재 중요도:</system:String>
7070
<system:String x:Key="newPriority">새 중요도:</system:String>
7171
<system:String x:Key="priority">중요도</system:String>
72+
<system:String x:Key="priorityToolTip">플러그인 결과 우선 순위 변경</system:String>
7273
<system:String x:Key="pluginDirectory">플러그인 폴더</system:String>
7374
<system:String x:Key="author">제작자</system:String>
7475
<system:String x:Key="plugin_init_time">초기화 시간:</system:String>

‎Flow.Launcher/Languages/zh-cn.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
<system:String x:Key="currentPriority">当前优先级</system:String>
7070
<system:String x:Key="newPriority">新优先级</system:String>
7171
<system:String x:Key="priority">优先级</system:String>
72+
<system:String x:Key="priorityToolTip">更改插件结果优先级</system:String>
7273
<system:String x:Key="pluginDirectory">插件目录</system:String>
7374
<system:String x:Key="author">出自</system:String>
7475
<system:String x:Key="plugin_init_time">加载耗时：</system:String>

‎Flow.Launcher/Languages/zh-tw.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
<system:String x:Key="currentPriority">目前優先</system:String>
7070
<system:String x:Key="newPriority">新增優先</system:String>
7171
<system:String x:Key="priority">優先</system:String>
72+
<system:String x:Key="priorityToolTip">更改插件結果優先順序</system:String>
7273
<system:String x:Key="pluginDirectory">外掛資料夾</system:String>
7374
<system:String x:Key="author">作者</system:String>
7475
<system:String x:Key="plugin_init_time">載入耗時：</system:String>

‎Flow.Launcher/SettingWindow.xaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -629,6 +629,7 @@
629629
<ItemsControl Style="{StaticResource SettingGrid}">
630630
<StackPanel Style="{StaticResource TextPanel}">
631631
<TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource hideNotifyIcon}" />
632+
<TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource hideNotifyIconToolTip}" />
632633
</StackPanel>
633634
<CheckBox IsChecked="{Binding Settings.HideNotifyIcon}" Style="{DynamicResource SideControlCheckBox}" />
634635
</ItemsControl>
@@ -868,6 +869,9 @@
868869
ItemsSource="{Binding Languages}"
869870
SelectedValue="{Binding Language}"
870871
SelectedValuePath="LanguageCode" />
872+
<TextBlock Style="{StaticResource Glyph}">
873+
&#xf2b7;
874+
</TextBlock>
871875
</ItemsControl>
872876
</Border>
873877
</StackPanel>
@@ -994,7 +998,7 @@
994998
Click="OnPluginPriorityClick"
995999
Content="{Binding Priority, UpdateSourceTrigger=PropertyChanged}"
9961000
Cursor="Hand"
997-
ToolTip="Change Plugin Results Priority">
1001+
ToolTip="{DynamicResource priorityToolTip}">
9981002
<!--#region Priority Button Style-->
9991003
<Button.Resources>
10001004
<Style TargetType="Border">
@@ -2502,7 +2506,7 @@
25022506
</StackPanel>
25032507
<StackPanel
25042508
Grid.Column="2"
2505-
Margin="0,0,30,0"
2509+
Margin="0,0,18,0"
25062510
VerticalAlignment="Center"
25072511
Orientation="Horizontal">
25082512
<TextBlock Margin="0,0,12,0">
@@ -2548,7 +2552,7 @@
25482552
</StackPanel>
25492553
<StackPanel
25502554
Grid.Column="2"
2551-
Margin="0,0,30,0"
2555+
Margin="0,0,18,0"
25522556
VerticalAlignment="Center"
25532557
Orientation="Horizontal">
25542558
<TextBlock Margin="0,0,12,0">

‎Flow.Launcher/Themes/BlurBlack Darker.xaml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88

99
<system:Boolean x:Key="ThemeBlurEnabled">True</system:Boolean>
1010

11+
<Style x:Key="WindowRadius" TargetType="{x:Type Border}">
12+
<Setter Property="CornerRadius" Value="0" />
13+
</Style>
1114
<Style
1215
x:Key="ItemGlyph"
1316
BasedOn="{StaticResource BaseGlyphStyle}"
@@ -34,9 +37,13 @@
3437
x:Key="WindowBorderStyle"
3538
BasedOn="{StaticResource BaseWindowBorderStyle}"
3639
TargetType="{x:Type Border}">
40+
41+
<Setter Property="BorderThickness" Value="1" />
42+
<Setter Property="BorderBrush" Value="#444444" />
43+
<Setter Property="CornerRadius" Value="0" />
3744
<Setter Property="Background">
3845
<Setter.Value>
39-
<SolidColorBrush Opacity="0.6" Color="Black" />
46+
<SolidColorBrush Opacity="0.9" Color="Black" />
4047
</Setter.Value>
4148
</Setter>
4249
</Style>
@@ -88,7 +95,7 @@
8895
<Setter Property="Foreground" Value="#FFFFFFFF" />
8996
<Setter Property="Opacity" Value="0.5" />
9097
</Style>
91-
<SolidColorBrush x:Key="ItemSelectedBackgroundColor">#356ef3</SolidColorBrush>
98+
<SolidColorBrush x:Key="ItemSelectedBackgroundColor">#19ffffff</SolidColorBrush>
9299

93100
<!-- button style in the middle of the scrollbar -->
94101
<Style

0 commit comments

Comments
 (0)