Skip to content

Commit

Permalink
Merge pull request #1591 from GF-Huang/fix-#1277
Browse files Browse the repository at this point in the history
Fix #1277.
  • Loading branch information
NaBian authored Jul 6, 2024
2 parents e7ebe47 + 01f50c5 commit 1a5d6f4
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
10 changes: 8 additions & 2 deletions src/Shared/HandyControl_Shared/Controls/Window/Window.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
using HandyControl.Tools;
using HandyControl.Tools.Extension;
using HandyControl.Tools.Interop;
using HandyControl.Tools.Helper;

#if NET40
using Microsoft.Windows.Shell;
#else
Expand Down Expand Up @@ -61,10 +63,14 @@ public Window()
#else
var chrome = new WindowChrome
{
CornerRadius = new CornerRadius(),
GlassFrameThickness = new Thickness(0, 0, 0, 1),
UseAeroCaptionButtons = false
};

if (SystemHelper.GetSystemVersionInfo() < SystemVersionInfo.Windows11_22H2)
{
chrome.GlassFrameThickness = new Thickness(0, 0, 0, 1);
chrome.CornerRadius = new CornerRadius();
}
#endif
BindingOperations.SetBinding(chrome, WindowChrome.CaptionHeightProperty,
new Binding(NonClientAreaHeightProperty.Name) { Source = this });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@ namespace HandyControl.Data;
public readonly struct SystemVersionInfo
{
public static SystemVersionInfo Windows10 => new(10, 0, 10240);

public static SystemVersionInfo Windows10_1809 => new(10, 0, 17763);

public static SystemVersionInfo Windows10_1903 => new(10, 0, 18362);
public static SystemVersionInfo Windows11_22H2 => new(10, 0, 22621);

public SystemVersionInfo(int major, int minor, int build)
{
Expand Down

0 comments on commit 1a5d6f4

Please sign in to comment.