prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'dev' into bug_1269

Browse source
This commit is contained in:
Kevin Zhang 2022-08-05 14:43:55 -05:00 committed by GitHub
commit d28fbeffa9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Flow.Launcher.Core/Resource/Theme.cs
View file

@ -85,10 +85,13 @@ namespace Flow.Launcher.Core.Resource
Settings.Theme = theme; Settings.Theme = theme;
// reload all resources even if the theme itself hasn't changed in order to pickup changes
// to things like fonts
UpdateResourceDictionary(GetResourceDictionary());
//always allow re-loading default theme, in case of failure of switching to a new theme from default theme //always allow re-loading default theme, in case of failure of switching to a new theme from default theme
if (_oldTheme != theme || theme == defaultTheme) if (_oldTheme != theme || theme == defaultTheme)
{ {
UpdateResourceDictionary(GetResourceDictionary());
_oldTheme = Path.GetFileNameWithoutExtension(_oldResource.Source.AbsolutePath); _oldTheme = Path.GetFileNameWithoutExtension(_oldResource.Source.AbsolutePath);
} }

11
Flow.Launcher/SettingWindow.xaml
View file

@ -915,6 +915,7 @@
Padding="0,0,0,0" Padding="0,0,0,0"
Background="{DynamicResource Color01B}"> Background="{DynamicResource Color01B}">
<ListBox <ListBox
Name="Plugins"
Width="Auto" Width="Auto"
Margin="5,0,0,0" Margin="5,0,0,0"
Padding="0,0,7,0" Padding="0,0,7,0"
@ -926,8 +927,7 @@
ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
SelectedItem="{Binding SelectedPlugin}" SelectedItem="{Binding SelectedPlugin}"
SelectionChanged="SelectedPluginChanged" SelectionChanged="SelectedPluginChanged"
SnapsToDevicePixels="True" SnapsToDevicePixels="True">
Name="Plugins">
<ListBox.ItemsPanel> <ListBox.ItemsPanel>
<ItemsPanelTemplate> <ItemsPanelTemplate>
<StackPanel Margin="0,0,0,18" /> <StackPanel Margin="0,0,0,18" />
@ -1116,8 +1116,8 @@
Margin="0" Margin="0"
Padding="1" Padding="1"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
Content="{Binding SettingControl}" Content="{Binding SettingControl}"
SizeChanged="ItemSizeChanged"/> SizeChanged="ItemSizeChanged" />
</StackPanel> </StackPanel>
<StackPanel> <StackPanel>
@ -1127,8 +1127,7 @@
VerticalAlignment="Center" VerticalAlignment="Center"
BorderThickness="0,1,0,0" BorderThickness="0,1,0,0"
CornerRadius="0" CornerRadius="0"
Style="{DynamicResource SettingGroupBox}" Style="{DynamicResource SettingGroupBox}">
Visibility="{Binding ActionKeywordsVisibility}">
<ItemsControl Style="{DynamicResource SettingGrid}"> <ItemsControl Style="{DynamicResource SettingGrid}">
<StackPanel <StackPanel
Margin="0,0,-14,0" Margin="0,0,-14,0"