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 'bug_1269' of https://github.com/nachmore/Flow.Launcher into bug_1269

Browse source
This commit is contained in:
Oren Nachman 2022-08-07 19:57:04 -07:00
commit 91ada374d8
5 changed files with 41 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Flow.Launcher.Core/Plugin/JsonPRCModel.cs
View file

@ -93,4 +93,4 @@ namespace Flow.Launcher.Core.Plugin
public Dictionary<string, object> SettingsChange { get; set; }
}
}
}

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

@ -85,10 +85,13 @@ namespace Flow.Launcher.Core.Resource
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
if (_oldTheme != theme || theme == defaultTheme)
{
UpdateResourceDictionary(GetResourceDictionary());
_oldTheme = Path.GetFileNameWithoutExtension(_oldResource.Source.AbsolutePath);
}

11
Flow.Launcher/SettingWindow.xaml
View file

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

6
Flow.Launcher/ViewModel/SettingWindowViewModel.cs
View file

@ -60,7 +60,13 @@ namespace Flow.Launcher.ViewModel
Settings.AutoUpdates = value;
if (value)
{
UpdateApp();
SetStartup();
} else
{
RemoveStartup();
}
}
}

29
README.md
View file

@ -38,10 +38,13 @@ Dedicated to making your workflow flow more seamless. Search everything from app
<img src="https://user-images.githubusercontent.com/6903107/144858082-8b654daf-60fb-4ee6-89b2-6183b73510d1.png" width="100%">
<h4 align="center">
<a href="#Getting-Started">Getting Started</a> • <a href="#Features">Features</a> • <a href="#Plugins">Plugins</a> •
<a href="#Hotkeys">Hotkeys</a> •
<a href="#QuestionsSuggestions">Questions/Suggestions</a> •
<a href="#Development">Development</a> •
<a href="#-getting-started">Getting Started</a> •
<a href="#-features">Features</a> •
<a href="#-plugins">Plugins</a> •
<a href="#%EF%B8%8F-hotkeys">Hotkeys</a> •
<a href="#sponsors">Sponsors</a> •
<a href="#-questionssuggestions">Questions/Suggestions</a> •
<a href="#development">Development</a> •
<a href="https://flowlauncher.com/docs">Docs</a>
</h4>
@ -262,10 +265,28 @@ And you can download <a href="https://github.com/Flow-Launcher/Flow.Launcher/dis
<img src="https://user-images.githubusercontent.com/6903107/144858082-8b654daf-60fb-4ee6-89b2-6183b73510d1.png" width="100%">
## Sponsors
<p align="center">
<a href="https://appwrite.io">
<img src='https://appwrite.io/images-ee/press/logo-1.svg' width="25%"/>
</a>
</p>
<p align="left">
<a href="https://dev.to/appwrite/appwrite-loves-open-source-why-i-chose-to-support-flow-launcher-54pj">
:sparkles:<i>Why I Chose to Support Flow-Launcher</i>:sparkles:
</a>
</p>
<img src="https://user-images.githubusercontent.com/6903107/144858082-8b654daf-60fb-4ee6-89b2-6183b73510d1.png" width="100%">
## ❔ Questions/Suggestions
Yes please, let us know in the [Q&A](https://github.com/Flow-Launcher/Flow.Launcher/discussions/categories/q-a) section. **Join our community on [Discord](https://discord.gg/AvgAQgh)!**
<img src="https://user-images.githubusercontent.com/6903107/144858082-8b654daf-60fb-4ee6-89b2-6183b73510d1.png" width="100%">
## Development
### Contributing