Skip to content

Commit d4fbe33

Browse files
committed
Merge branch 'ModernTheme' of https://github.com/onesounds/Flow.Launcher into ModernTheme
2 parents 3bc09ef + 42dda34 commit d4fbe33

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

Flow.Launcher.Core/Resource/Theme.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ public ResourceDictionary GetResourceDictionary()
176176
dict["ItemSubTitleStyle"] is Style resultSubItemStyle &&
177177
dict["ItemSubTitleSelectedStyle"] is Style resultSubItemSelectedStyle &&
178178
dict["ItemTitleSelectedStyle"] is Style resultItemSelectedStyle &&
179+
dict["ItemHotkeyStyle"] is Style resultHotkeyItemStyle &&
179180
dict["ItemHotkeySelectedStyle"] is Style resultHotkeyItemSelectedStyle)
180181
{
181182
Setter fontFamily = new Setter(TextBlock.FontFamilyProperty, new FontFamily(Settings.ResultFont));
@@ -184,7 +185,9 @@ public ResourceDictionary GetResourceDictionary()
184185
Setter fontStretch = new Setter(TextBlock.FontStretchProperty, FontHelper.GetFontStretchFromInvariantStringOrNormal(Settings.ResultFontStretch));
185186

186187
Setter[] setters = { fontFamily, fontStyle, fontWeight, fontStretch };
187-
Array.ForEach(new[] { resultItemStyle, resultSubItemStyle, resultItemSelectedStyle, resultSubItemSelectedStyle, resultHotkeyItemSelectedStyle }, o => Array.ForEach(setters, p => o.Setters.Add(p)));
188+
Array.ForEach(
189+
new[] { resultItemStyle, resultSubItemStyle, resultItemSelectedStyle, resultSubItemSelectedStyle, resultHotkeyItemStyle, resultHotkeyItemSelectedStyle }, o
190+
=> Array.ForEach(setters, p => o.Setters.Add(p)));
188191
}
189192

190193
var windowStyle = dict["WindowStyle"] as Style;

Flow.Launcher/SettingWindow.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@
447447
<TextBlock Text="{Binding PluginPair.Metadata.Name}" TextWrapping="Wrap" ToolTip="{Binding PluginPair.Metadata.Version}" />
448448
<TextBlock Opacity="0.5" TextWrapping="Wrap" Margin="0 2 0 0">
449449
<Run Text="{Binding PluginPair.Metadata.Version}"/>
450-
</TextBlock>a
450+
</TextBlock>
451451
</StackPanel>
452452
</Grid>
453453
</DockPanel>

0 commit comments

Comments
 (0)