Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion FluentFlyoutWPF/Classes/ThemeManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public static void UpdateTrayIcon()
{
if (SettingsManager.Current.NIconSymbol == true)
{
var iconUri = new Uri(WindowsThemeHelper.GetCurrentWindowsTheme() == WindowsTheme.Dark
var iconUri = new Uri(MicaWPFServiceUtility.ThemeService.CurrentTheme == WindowsTheme.Dark
? "pack://application:,,,/Resources/TrayIcons/FluentFlyoutWhite.png"
: "pack://application:,,,/Resources/TrayIcons/FluentFlyoutBlack.png");
nIcon.Icon = new BitmapImage(iconUri);
Expand Down
6 changes: 3 additions & 3 deletions FluentFlyoutWPF/Controls/TaskbarVisualizerControl.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// Copyright 2024-2026 The FluentFlyout Authors
// Copyright © 2024-2026 The FluentFlyout Authors
// SPDX-License-Identifier: GPL-3.0-or-later

using FluentFlyout.Classes.Settings;
using FluentFlyoutWPF;
using FluentFlyoutWPF.Classes;
using MicaWPF.Core.Enums;
using MicaWPF.Core.Helpers;
using MicaWPF.Core.Services;
using System.Windows.Controls;
using System.Windows.Input;
using System.Windows.Media;
Expand Down Expand Up @@ -77,7 +77,7 @@ private void Grid_MouseEnter(object sender, MouseEventArgs e)

SolidColorBrush targetBackgroundBrush;
// hover effects with animations, hard-coded colors because I can't find the resource brushes
if (WindowsThemeHelper.GetCurrentWindowsTheme() == WindowsTheme.Dark)
if (MicaWPFServiceUtility.ThemeService.CurrentTheme == WindowsTheme.Dark)
{ // dark mode
targetBackgroundBrush = new SolidColorBrush(Color.FromArgb(197, 255, 255, 255)) { Opacity = 0.075 };
TopBorder.BorderBrush = new SolidColorBrush(Color.FromArgb(93, 255, 255, 255)) { Opacity = 0.25 };
Expand Down
7 changes: 4 additions & 3 deletions FluentFlyoutWPF/Controls/TaskbarWidgetControl.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using FluentFlyout.Classes.Utils;
using FluentFlyoutWPF;
using MicaWPF.Core.Enums;
using MicaWPF.Core.Helpers;
using MicaWPF.Core.Services;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
Expand Down Expand Up @@ -93,10 +93,11 @@ public void SetMainWindow(MainWindow mainWindow)

public void ApplyWindowsTheme()
{
bool isDark = WindowsThemeHelper.GetCurrentWindowsTheme() == WindowsTheme.Dark;
bool isDark = MicaWPFServiceUtility.ThemeService.CurrentTheme == WindowsTheme.Dark;
var foreground = new SolidColorBrush(isDark
? Color.FromArgb(0xFF, 0xFF, 0xFF, 0xFF)
: Color.FromArgb(0xE4, 0x1C, 0x1C, 0x1C));

SongTitle.Foreground = foreground;
SongArtist.Foreground = foreground;
}
Expand All @@ -107,7 +108,7 @@ private void Grid_MouseEnter(object sender, MouseEventArgs e)

SolidColorBrush targetBackgroundBrush;
// hover effects with animations, hard-coded colors because I can't find the resource brushes
if (WindowsThemeHelper.GetCurrentWindowsTheme() == WindowsTheme.Dark)
if (MicaWPFServiceUtility.ThemeService.CurrentTheme == WindowsTheme.Dark)
{ // dark mode
targetBackgroundBrush = new SolidColorBrush(Color.FromArgb(197, 255, 255, 255)) { Opacity = 0.075 };
TopBorder.BorderBrush = new SolidColorBrush(Color.FromArgb(93, 255, 255, 255)) { Opacity = 0.25 };
Expand Down