Skip to content

fix: synchronize title bar colors with app theme #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pexatar merged 1 commit into from
Mar 15, 2026
Merged

fix: synchronize title bar colors with app theme #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 43 additions & 1 deletion src/PassKey.Desktop/MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
using CommunityToolkit.Mvvm.ComponentModel;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.UI;
using Microsoft.UI.Xaml;
using PassKey.Desktop.Services;
using PassKey.Desktop.ViewModels;
using PassKey.Desktop.Views;
using Windows.UI;

namespace PassKey.Desktop;

Expand All @@ -18,7 +20,9 @@ public MainWindow()
Title = "PassKey";
AppWindow.SetIcon(System.IO.Path.Combine(AppContext.BaseDirectory, "Assets", "PassKey.ico"));

// WinUI 3 uses HighVisibility focus visuals by default — no manual setup needed
// Update title bar colors whenever the system theme changes (user has "System" selected)
if (Content is FrameworkElement root)
root.ActualThemeChanged += (s, _) => UpdateTitleBarColors(((FrameworkElement)s).ActualTheme == ElementTheme.Dark);

_mainViewModel = App.Services.GetRequiredService<MainViewModel>();
_mainViewModel.PropertyChanged += OnViewModelPropertyChanged;
Expand Down Expand Up @@ -65,7 +69,45 @@ private void ApplySavedTheme()
public void ApplyTheme(ElementTheme theme)
{
if (Content is FrameworkElement root)
{
root.RequestedTheme = theme;
UpdateTitleBarColors(root.ActualTheme == ElementTheme.Dark);
}
}

private void UpdateTitleBarColors(bool isDark)
{
var tb = AppWindow.TitleBar;
if (isDark)
{
var bg = Color.FromArgb(255, 32, 32, 32);
var bgHover = Color.FromArgb(255, 55, 55, 55);
var bgPressed = Color.FromArgb(255, 75, 75, 75);
var fgDim = Color.FromArgb(255, 150, 150, 150);

tb.ForegroundColor = Colors.White;
tb.BackgroundColor = bg;
tb.ButtonForegroundColor = Colors.White;
tb.ButtonBackgroundColor = bg;
tb.ButtonHoverForegroundColor = Colors.White;
tb.ButtonHoverBackgroundColor = bgHover;
tb.ButtonPressedForegroundColor = Colors.White;
tb.ButtonPressedBackgroundColor = bgPressed;
tb.InactiveForegroundColor = fgDim;
tb.InactiveBackgroundColor = bg;
tb.ButtonInactiveForegroundColor = fgDim;
tb.ButtonInactiveBackgroundColor = bg;
}
else
{
// null restores system default colors (light theme)
tb.ForegroundColor = tb.BackgroundColor =
tb.ButtonForegroundColor = tb.ButtonBackgroundColor =
tb.ButtonHoverForegroundColor = tb.ButtonHoverBackgroundColor =
tb.ButtonPressedForegroundColor = tb.ButtonPressedBackgroundColor =
tb.InactiveForegroundColor = tb.InactiveBackgroundColor =
tb.ButtonInactiveForegroundColor = tb.ButtonInactiveBackgroundColor = null;
}
}

private void OnViewModelPropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
Expand Down
Loading