Skip to content

A Swiss Army knife for developers.

[Windows] fixed a bug where title bar's background color was misaligned (#1299)

Etienne Baudouxa9de87bbccca
diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/Controls/MicaWindowWithOverlay.xaml b/src/app/dev/platforms/desktop/DevToys.Windows/Controls/MicaWindowWithOverlay.xaml
index 439302773..8d42daba8 100644
--- a/src/app/dev/platforms/desktop/DevToys.Windows/Controls/MicaWindowWithOverlay.xaml
+++ b/src/app/dev/platforms/desktop/DevToys.Windows/Controls/MicaWindowWithOverlay.xaml
@@ -98,6 +98,11 @@
<Grid Margin="-1">
<AdornerDecorator>
<Grid Margin="{TemplateBinding MarginMaximized}">
+ <Border
+ x:Name="WindowTopBorder"
+ VerticalAlignment="Top"
+ Height="48"/>
+
<ContentPresenter />
<controls:OverlayControl
diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/Controls/MicaWindowWithOverlay.xaml.cs b/src/app/dev/platforms/desktop/DevToys.Windows/Controls/MicaWindowWithOverlay.xaml.cs
index f05c9b95c..0b3b4d9fa 100644
--- a/src/app/dev/platforms/desktop/DevToys.Windows/Controls/MicaWindowWithOverlay.xaml.cs
+++ b/src/app/dev/platforms/desktop/DevToys.Windows/Controls/MicaWindowWithOverlay.xaml.cs
@@ -11,11 +11,11 @@ using DevToys.Api;
using DevToys.Windows.Core;
using DevToys.Windows.Core.Helpers;
using DevToys.Windows.Native;
+using Microsoft.Win32;
using Windows.Win32;
using Windows.Win32.Foundation;
using Windows.Win32.Graphics.Dwm;
using Windows.Win32.UI.Controls;
-using Windows.Win32.UI.WindowsAndMessaging;
using Application = System.Windows.Application;
using Button = System.Windows.Controls.Button;
using Color = System.Windows.Media.Color;
@@ -34,6 +34,7 @@ public abstract partial class MicaWindowWithOverlay : Window
private Button? _maximizeButton;
private Button? _minimizeButton;
private StackPanel? _windowStateButtonsStackPanel;
+ private Border? _windowTopBorder;
private bool _isMouseButtonDownOnDraggableTitleBarArea;
private Point _mouseDownPositionOnDraggableTitleBarArea;
@@ -124,6 +125,7 @@ public abstract partial class MicaWindowWithOverlay : Window
_maximizeButton = (Button)Template.FindName("MaximizeButton", this);
var draggableTitleBarArea = (Border)Template.FindName("DraggableTitleBarArea", this);
var overlayControl = (OverlayControl)Template.FindName("TitleBar", this);
+ _windowTopBorder = (Border)Template.FindName("WindowTopBorder", this);
_windowStateButtonsStackPanel.SizeChanged += WindowStateButtonsStackPanel_SizeChanged;
closeButton.Click += CloseButton_Click;
@@ -483,6 +485,16 @@ public abstract partial class MicaWindowWithOverlay : Window
dictionaries.Remove(resourceDictionaryToRemove);
dictionaries.Add(resourceDictionary);
UpdateLayout();
+
+ Guard.IsNotNull(_windowTopBorder);
+ if (IsAccentColorOnTitleBarEnabled())
+ {
+ _windowTopBorder.Background = SystemParameters.WindowGlassBrush;
+ }
+ else
+ {
+ _windowTopBorder.Background = null;
+ }
}
private nint ShowSnapLayout(nint lParam, ref bool handled)
@@ -560,4 +572,22 @@ public abstract partial class MicaWindowWithOverlay : Window
NativeMethods.EnableMinimizeAndMaximizeCapabilities(windowHandle);
}
}
+
+ public static bool IsAccentColorOnTitleBarEnabled()
+ {
+ const string key = @"HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\DWM";
+ const string name = "ColorPrevalence";
+
+ object? value = Registry.GetValue(key, name, null);
+ if (value is null)
+ {
+ // Key doesn't exist, assume default (OFF)
+ return false;
+ }
+ else
+ {
+ // If the key value is 1, the setting is ON. Otherwise, it's OFF.
+ return ((int)value == 1);
+ }
+ }
}