From 91ca2c4a6a7a21502094c125911490a36374c8f5 Mon Sep 17 00:00:00 2001 From: dosymep Date: Thu, 7 Aug 2025 13:59:20 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80=D0=B8=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=82=D0=B5=D0=BC=D0=BD=D0=BE=D0=B9?= =?UTF-8?q?=20=D1=82=D0=B5=D0=BC=D1=8B=20(=D0=BD=D0=B5=20=D0=BF=D1=80?= =?UTF-8?q?=D0=B8=D0=BC=D0=B5=D0=BD=D1=8F=D0=BB=D1=81=D1=8F=20=D1=84=D0=BE?= =?UTF-8?q?=D0=BD=20=D0=B4=D0=BB=D1=8F=20=D0=BE=D0=BA=D0=BD=D0=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SimpleServices/WpfUIMessageBoxService.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/dosymep.WpfUI.Core/SimpleServices/WpfUIMessageBoxService.cs b/src/dosymep.WpfUI.Core/SimpleServices/WpfUIMessageBoxService.cs index 6ae9df8..74a53e5 100644 --- a/src/dosymep.WpfUI.Core/SimpleServices/WpfUIMessageBoxService.cs +++ b/src/dosymep.WpfUI.Core/SimpleServices/WpfUIMessageBoxService.cs @@ -60,11 +60,13 @@ public MessageBoxResult Show(string messageBoxText, void UpdateTheme(UIThemes uiTheme) { _theme.ThemeUpdaterService.SetTheme(uiTheme, messageBox); } - - try { + + messageBox.Initialized += (s, e) => { _theme.ThemeChanged += UpdateTheme; _theme.ThemeUpdaterService.SetTheme(_theme.HostTheme, messageBox); + }; + try { (MessageBoxResult closeResult, MessageBoxResult primaryResult, MessageBoxResult secondaryResult) = ShowMessageBox(button, messageBox); From eeb1477c857f37ecc8a02f27a1b708d93c6da4ff Mon Sep 17 00:00:00 2001 From: dosymep Date: Thu, 7 Aug 2025 14:00:11 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D0=92=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=BE=D1=81=D0=B0?= =?UTF-8?q?=20=D1=82=D0=B5=D0=BA=D1=81=D1=82=D0=B0=20=D0=B8=20=D0=B2=D1=8B?= =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=BD=D0=B8=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20?= =?UTF-8?q?=D0=BF=D0=BE=20=D1=88=D0=B8=D1=80=D0=B8=D0=BD=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/MessageBoxContentTemplate.xaml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/dosymep.WpfUI.Core/Views/MessageBoxContentTemplate.xaml b/src/dosymep.WpfUI.Core/Views/MessageBoxContentTemplate.xaml index 50d1fd4..7ac8abd 100644 --- a/src/dosymep.WpfUI.Core/Views/MessageBoxContentTemplate.xaml +++ b/src/dosymep.WpfUI.Core/Views/MessageBoxContentTemplate.xaml @@ -2,22 +2,23 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"> - + - + \ No newline at end of file From b293e8abc7f8fa24c23a387460a4c45ca6df854e Mon Sep 17 00:00:00 2001 From: dosymep Date: Fri, 8 Aug 2025 15:18:15 +0300 Subject: [PATCH 3/3] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=84=D0=BE=D0=BD=D0=BE=D0=B2=D0=BE=D0=B3?= =?UTF-8?q?=D0=BE=20=D0=BE=D1=84=D0=BE=D1=80=D0=BC=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=BE=D0=BA=D0=BE=D0=BD=20=D0=B8=20=D0=B8=D1=81=D0=BF?= =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B8=D0=BD?= =?UTF-8?q?=D0=B8=D1=86=D0=B8=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0=D1=86=D0=B8?= =?UTF-8?q?=D0=B8=20=D1=82=D0=B5=D0=BC=D1=8B=20=D0=B2=20=D1=81=D0=BE=D0=BE?= =?UTF-8?q?=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D1=8F=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SimpleServices/WpfUIMessageBoxService.cs | 6 ++---- .../SimpleServices/WpfUIThemeUpdaterService.cs | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/dosymep.WpfUI.Core/SimpleServices/WpfUIMessageBoxService.cs b/src/dosymep.WpfUI.Core/SimpleServices/WpfUIMessageBoxService.cs index 74a53e5..bf7f3f2 100644 --- a/src/dosymep.WpfUI.Core/SimpleServices/WpfUIMessageBoxService.cs +++ b/src/dosymep.WpfUI.Core/SimpleServices/WpfUIMessageBoxService.cs @@ -61,10 +61,8 @@ void UpdateTheme(UIThemes uiTheme) { _theme.ThemeUpdaterService.SetTheme(uiTheme, messageBox); } - messageBox.Initialized += (s, e) => { - _theme.ThemeChanged += UpdateTheme; - _theme.ThemeUpdaterService.SetTheme(_theme.HostTheme, messageBox); - }; + _theme.ThemeChanged += UpdateTheme; + _theme.ThemeUpdaterService.SetTheme(_theme.HostTheme, messageBox); try { (MessageBoxResult closeResult, diff --git a/src/dosymep.WpfUI.Core/SimpleServices/WpfUIThemeUpdaterService.cs b/src/dosymep.WpfUI.Core/SimpleServices/WpfUIThemeUpdaterService.cs index 278d48d..217a338 100644 --- a/src/dosymep.WpfUI.Core/SimpleServices/WpfUIThemeUpdaterService.cs +++ b/src/dosymep.WpfUI.Core/SimpleServices/WpfUIThemeUpdaterService.cs @@ -37,7 +37,7 @@ public void SetTheme(UIThemes theme, FrameworkElement frameworkElement) { } if(frameworkElement is Window window) { - WindowBackgroundManager.UpdateBackground(window, GetAppTheme(theme), WindowBackdropType.Mica); + WindowBackgroundManager.UpdateBackground(window, GetAppTheme(theme), WindowBackdropType.None); } }