Skip to content

Исправления MessageBox #9

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
merged 3 commits into from
Aug 8, 2025
Merged

Исправления MessageBox #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
91ca2c4
Исправление применение темной темы (не применялся фон для окна)
dosymep Aug 7, 2025
eeb1477
Включение переноса текста и выравнивание по ширине
dosymep Aug 7, 2025
b293e8a
Обновление фонового оформления окон и исправление инициализации темы …
dosymep Aug 8, 2025
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
6 changes: 3 additions & 3 deletions src/dosymep.WpfUI.Core/SimpleServices/WpfUIMessageBoxService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ public MessageBoxResult Show(string messageBoxText,
void UpdateTheme(UIThemes uiTheme) {
_theme.ThemeUpdaterService.SetTheme(uiTheme, messageBox);
}

_theme.ThemeChanged += UpdateTheme;
_theme.ThemeUpdaterService.SetTheme(_theme.HostTheme, messageBox);

try {
_theme.ThemeChanged += UpdateTheme;
_theme.ThemeUpdaterService.SetTheme(_theme.HostTheme, messageBox);

(MessageBoxResult closeResult,
MessageBoxResult primaryResult,
MessageBoxResult secondaryResult) = ShowMessageBox(button, messageBox);
Expand Down
2 changes: 1 addition & 1 deletion src/dosymep.WpfUI.Core/SimpleServices/WpfUIThemeUpdaterService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
13 changes: 7 additions & 6 deletions src/dosymep.WpfUI.Core/Views/MessageBoxContentTemplate.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,23 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml">
<DataTemplate x:Key="MessageBoxContentTemplate">
<StackPanel
Margin="10"
Orientation="Horizontal">
<DockPanel Margin="8" LastChildFill="True">

<!-- ReSharper disable once Xaml.BindingWithContextNotResolved -->
<ui:Image
Margin="10 0"
DockPanel.Dock="Left"
Margin="14 0"
Height="26"
VerticalAlignment="Center"
Source="{Binding ImageSource}" />

<!-- ReSharper disable once Xaml.BindingWithContextNotResolved -->
<ui:TextBlock
Margin="0 0 10 0"
Margin="0 0 14 0"
TextWrapping="Wrap"
TextAlignment="Justify"
VerticalAlignment="Center"
Text="{Binding MessageBoxText}" />
</StackPanel>
</DockPanel>
</DataTemplate>
</ResourceDictionary>
Loading