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

Improve theme resource access robustness

Browse source 
Refactored theme resource dictionary lookups to safely check for "WindowBorderStyle" before accessing, preventing potential exceptions. Updated three methods to handle missing styles gracefully and standardized resource key checks. GetWindowBorderStyleBackground now returns transparent if style is missing.
This commit is contained in:
Jack251970 2026-03-01 14:05:36 +08:00
parent 3db201f4a3
commit c87f3d3447
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -526,7 +526,8 @@ namespace Flow.Launcher.Core.Resource
// Get current theme's WindowBorderStyle
var theme = _settings.Theme;
var dict = GetThemeResourceDictionary(theme);
if (dict["WindowBorderStyle"] is not Style windowBorderStyle) return;
var windowBorderStyle = dict.Contains("WindowBorderStyle") ? dict["WindowBorderStyle"] as Style : null;
if (windowBorderStyle == null) return;
// Get a new unsealed style based on the old one, and copy Resources and Triggers
var newWindowBorderStyle = GetNewWindowBorderStyle(windowBorderStyle);
@ -594,7 +595,8 @@ namespace Flow.Launcher.Core.Resource
// Get current theme's WindowBorderStyle
var theme = _settings.Theme;
var dict = GetThemeResourceDictionary(theme);
if (dict["WindowBorderStyle"] is not Style windowBorderStyle) return;
var windowBorderStyle = dict.Contains("WindowBorderStyle") ? dict["WindowBorderStyle"] as Style : null;
if (windowBorderStyle == null) return;
// Get a new unsealed style based on the old one, and copy Resources and Triggers
var newWindowBorderStyle = GetNewWindowBorderStyle(windowBorderStyle);
@ -855,8 +857,9 @@ namespace Flow.Launcher.Core.Resource
// for theme has not "LightBG" or "DarkBG" case.
private Color GetWindowBorderStyleBackground(string theme)
{
var Resources = GetThemeResourceDictionary(theme);
var windowBorderStyle = (Style)Resources["WindowBorderStyle"];
var dict = GetThemeResourceDictionary(theme);
var windowBorderStyle = dict.Contains("WindowBorderStyle") ? dict["WindowBorderStyle"] as Style : null;
if (windowBorderStyle == null) return Colors.Transparent; // Default is transparent
var backgroundSetter = windowBorderStyle.Setters
.OfType<Setter>()
@ -877,9 +880,9 @@ namespace Flow.Launcher.Core.Resource
var resourceKey = dynamicResource.ResourceKey.ToString();
// find key in resource and return color.
if (Resources.Contains(resourceKey))
if (dict.Contains(resourceKey))
{
var colorResource = Resources[resourceKey];
var colorResource = dict[resourceKey];
if (colorResource is SolidColorBrush colorBrush)
{
return colorBrush.Color;