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

Add WindowCornerRadius Property function

Browse source
This commit is contained in:
DB p 2025-03-02 06:10:29 +09:00
parent 6a736a833b
commit 70543d2378
3 changed files with 46 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,6 +20,8 @@ using System.Diagnostics;
using Microsoft.Win32;
using CommunityToolkit.Mvvm.DependencyInjection;
using Flow.Launcher.Plugin;
using static System.Windows.Forms.VisualStyles.VisualStyleElement;
using TextBox = System.Windows.Controls.TextBox;
namespace Flow.Launcher.Core.Resource
{
@ -72,6 +74,21 @@ namespace Flow.Launcher.Core.Resource
}
#region Blur Handling
private const int DWMWA_WINDOW_CORNER_PREFERENCE = 33;
public enum DWM_WINDOW_CORNER_PREFERENCE
{
Default = 0,
DoNotRound = 1,
Round = 2,
RoundSmall = 3
}
[DllImport("dwmapi.dll")]
private static extern int DwmSetWindowAttribute(IntPtr hwnd, int dwAttribute, ref DWM_WINDOW_CORNER_PREFERENCE pvAttribute, int cbAttribute);
public static void SetWindowCornerPreference(System.Windows.Window window, DWM_WINDOW_CORNER_PREFERENCE preference)
{
IntPtr hWnd = new WindowInteropHelper(window).Handle;
DwmSetWindowAttribute(hWnd, DWMWA_WINDOW_CORNER_PREFERENCE, ref preference, sizeof(int));
}
public class ParameterTypes
{
@ -111,7 +128,7 @@ namespace Flow.Launcher.Core.Resource
=> DwmSetWindowAttribute(hwnd, attribute, ref parameter, Marshal.SizeOf<int>());
}
Window mainWindow = Application.Current.MainWindow;
System.Windows.Window mainWindow = Application.Current.MainWindow;
public void RefreshFrame()
{
@ -138,9 +155,34 @@ namespace Flow.Launcher.Core.Resource
//Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_SYSTEMBACKDROP_TYPE, 3);
ThemeModeColor(BlurMode());
SetBlurForWindow();
SetCornerForWindow();
}
public void SetCornerForWindow()
{
var dict = GetThemeResourceDictionary(_settings.Theme);
if (dict == null)
return;
if (dict.Contains("CornerType") && dict["CornerType"] is string cornerMode)
{
DWM_WINDOW_CORNER_PREFERENCE preference = cornerMode switch
{
"DONOTROUND" => DWM_WINDOW_CORNER_PREFERENCE.DoNotRound,
"ROUND" => DWM_WINDOW_CORNER_PREFERENCE.Round,
"ROUNDSMALL" => DWM_WINDOW_CORNER_PREFERENCE.RoundSmall,
_ => DWM_WINDOW_CORNER_PREFERENCE.Default,
};
SetWindowCornerPreference(mainWindow, preference);
}
else
{
SetWindowCornerPreference(mainWindow, DWM_WINDOW_CORNER_PREFERENCE.Default);
}
}
/// <summary>
/// Sets the blur for a window via SetWindowCompositionAttribute
@ -536,7 +578,7 @@ namespace Flow.Launcher.Core.Resource
/* Ignore Theme Window Width and use setting */
var windowStyle = dict["WindowStyle"] as Style;
var width = _settings.WindowSize;
windowStyle.Setters.Add(new Setter(Window.WidthProperty, width));
windowStyle.Setters.Add(new Setter(System.Windows.Window.WidthProperty, width));
mainWindowWidth = (double)width;
return dict;
}

2
Flow.Launcher/Themes/Base.xaml
View file

@ -93,7 +93,7 @@
<Setter Property="BorderThickness" Value="0" />
<Setter Property="Background" Value="#2F2F2F" />
<Setter Property="Padding" Value="0 0 0 0" />
<Setter Property="CornerRadius" Value="5" />
<Setter Property="CornerRadius" Value="0" />
<Setter Property="UseLayoutRounding" Value="True" />
<Setter Property="SnapsToDevicePixels" Value="True" />
</Style>

1
Flow.Launcher/Themes/Win11Light.xaml
View file

@ -14,6 +14,7 @@
</ResourceDictionary.MergedDictionaries>
<system:Boolean x:Key="ThemeBlurEnabled">True</system:Boolean>
<system:String x:Key="BlurMode">Auto</system:String>
<system:String x:Key="CornerType">ROUND</system:String>
<Color x:Key="lightBG">#BFFAFAFA</Color>
<Color x:Key="darkBG">#DD202020</Color>
<Style