Skip to content

Commit d89eb09

Browse files
committed
feature: drop Windows 11 Mica support
Signed-off-by: leo <longshuang@msn.cn>
1 parent c54a1d4 commit d89eb09

4 files changed

Lines changed: 1 addition & 22 deletions

File tree

‎src/App.axaml.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,6 @@ public static void SetTheme(string theme, string themeOverridesFile)
151151
else
152152
Models.CommitGraph.SetDefaultPens(overrides.GraphPenThickness);
153153

154-
Native.OS.UseMicaOnWindows11 = overrides.UseMicaOnWindows11;
155-
156154
app.Resources.MergedDictionaries.Add(resDic);
157155
app._themeOverrides = resDic;
158156
}

‎src/Native/OS.cs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,6 @@ public static string ExternalDiffArgs
112112
set;
113113
} = string.Empty;
114114

115-
public static bool UseMicaOnWindows11
116-
{
117-
get => OperatingSystem.IsWindows() && OperatingSystem.IsWindowsVersionAtLeast(10, 0, 22000) && _enableMicaOnWindows11;
118-
set => _enableMicaOnWindows11 = value;
119-
}
120-
121115
public static bool UseSystemWindowFrame
122116
{
123117
get => OperatingSystem.IsLinux() && _enableSystemWindowFrame;
@@ -349,6 +343,5 @@ private static void UpdateGitVersion()
349343
private static IBackend _backend = null;
350344
private static string _gitExecutable = string.Empty;
351345
private static bool _enableSystemWindowFrame = false;
352-
private static bool _enableMicaOnWindows11 = true;
353346
}
354347
}

‎src/Views/Launcher.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
<Grid Grid.Row="0" ColumnDefinitions="Auto,32,32,*,Auto">
2323
<!-- Bottom border -->
2424
<Border Grid.Column="0" Grid.ColumnSpan="5"
25-
x:Name="TitleBarBG"
2625
BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
26+
Background="{DynamicResource Brush.TitleBar}"
2727
DoubleTapped="MaximizeOrRestoreWindow"
2828
PointerPressed="BeginMoveWindow"/>
2929

‎src/Views/Launcher.axaml.cs‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using Avalonia.Controls;
55
using Avalonia.Input;
66
using Avalonia.Interactivity;
7-
using Avalonia.Markup.Xaml.MarkupExtensions;
87
using Avalonia.Media;
98
using Avalonia.Platform;
109
using Avalonia.VisualTree;
@@ -62,17 +61,6 @@ public Launcher()
6261
InitializeComponent();
6362
PositionChanged += OnPositionChanged;
6463

65-
if (Native.OS.UseMicaOnWindows11)
66-
{
67-
Background = Brushes.Transparent;
68-
TransparencyLevelHint = [WindowTransparencyLevel.Mica];
69-
TitleBarBG.Background = Brushes.Transparent;
70-
}
71-
else
72-
{
73-
TitleBarBG.Bind(BackgroundProperty, new DynamicResourceExtension("Brush.TitleBar"));
74-
}
75-
7664
var layout = ViewModels.Preferences.Instance.Layout;
7765
Width = layout.LauncherWidth;
7866
Height = layout.LauncherHeight;

0 commit comments

Comments
 (0)