refactor(msgbox): add customizable DialogControl + Dialog API #3168
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Collections.ObjectModel; | ||
| using PCL.Core.App.Localization; | ||
|
|
||
| namespace PCL.Core.UI; | ||
|
|
||
| public class DialogButton | ||
| { | ||
| public string Text { get; set; } | ||
| public Action? OnClick { get; set; } | ||
| public bool IsPrimary { get; set; } | ||
|
|
||
| public DialogButton(string text, Action? onClick = null, bool isPrimary = false) | ||
| { | ||
| Text = text; | ||
| OnClick = onClick; | ||
| IsPrimary = isPrimary; | ||
| } | ||
| } | ||
|
|
||
| public static class Dialog | ||
| { | ||
| public static event Action<DialogContext>? OnShow; | ||
|
|
||
| public static int Show(string caption, string? title = null, | ||
| DialogTheme theme = DialogTheme.Info, bool block = true, | ||
| params string[] buttons) | ||
| { | ||
| return Show(new DialogContext | ||
| { | ||
| Caption = caption, | ||
| Title = title ?? Lang.Text("Common.Dialog.Title"), | ||
| Theme = theme, | ||
| Block = block, | ||
| Content = null, | ||
| Buttons = BuildButtons(buttons, theme), | ||
| }); | ||
| } | ||
|
|
||
| public static int Show(DialogContext context) | ||
| { | ||
| if (context.Buttons.Count == 0) | ||
| context.Buttons.Add(new DialogButton(Lang.Text("Common.Action.Confirm"))); | ||
| OnShow?.Invoke(context); | ||
| return context.Result; | ||
| } | ||
|
|
||
| private static Collection<DialogButton> BuildButtons(string[] buttonTexts, DialogTheme theme) | ||
| { | ||
| var list = new Collection<DialogButton>(); | ||
| for (var i = 0; i < buttonTexts.Length; i++) | ||
| { | ||
| list.Add(new DialogButton(buttonTexts[i], isPrimary: i == 0)); | ||
| } | ||
| return list; | ||
| } | ||
| } | ||
|
|
||
| public enum DialogTheme | ||
| { | ||
| Info, | ||
| Warning, | ||
| Error | ||
| } | ||
|
|
||
| public class DialogContext | ||
| { | ||
| public string Caption { get; set; } = ""; | ||
| public string Title { get; set; } = ""; | ||
| public DialogTheme Theme { get; set; } = DialogTheme.Info; | ||
| public bool Block { get; set; } = true; | ||
| public object? Content { get; set; } | ||
| public Collection<DialogButton> Buttons { get; set; } = []; | ||
| public int Result { get; set; } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,181 @@ | ||
| using System.Windows; | ||
| using System.Windows.Controls; | ||
| using System.Windows.Input; | ||
| using System.Windows.Interop; | ||
| using System.Windows.Threading; | ||
| using PCL.Core.UI.Controls; | ||
|
|
||
| namespace PCL; | ||
|
|
||
| public partial class DialogControl | ||
| { | ||
| private int _result; | ||
| private bool _exited; | ||
| private readonly int _uuid = ModBase.GetUuid(); | ||
| private readonly List<MyButton> _buttons = []; | ||
|
|
||
| public DispatcherFrame WaitFrame { get; } = new(true); | ||
|
|
||
| public string Title | ||
| { | ||
| get => LabTitle.Text; | ||
| set => LabTitle.Text = value; | ||
| } | ||
|
|
||
| public bool IsWarn { get; set; } | ||
|
|
||
| public UIElement? DialogContent | ||
| { | ||
| get => (UIElement?)ContentArea.Content; | ||
| set => ContentArea.Content = value; | ||
| } | ||
|
|
||
| public int Result => _result; | ||
|
|
||
| public DialogControl() | ||
| { | ||
| try | ||
| { | ||
| InitializeComponent(); | ||
| ShapeLine.StrokeThickness = ModBase.GetWPFSize(1d); | ||
| } | ||
| catch (Exception ex) | ||
| { | ||
| ModBase.Log(ex, "DialogControl 初始化失败", ModBase.LogLevel.Hint); | ||
| } | ||
|
|
||
| Loaded += OnLoad; | ||
| } | ||
|
|
||
| public MyButton AddButton(string text, Action? onClick = null, bool isPrimary = false) | ||
| { | ||
| var btn = new MyButton | ||
| { | ||
| Text = text, | ||
| ColorType = isPrimary | ||
| ? (IsWarn ? MyButton.ColorState.Red : MyButton.ColorState.Highlight) | ||
| : MyButton.ColorState.Normal, | ||
| Visibility = string.IsNullOrEmpty(text) ? Visibility.Collapsed : Visibility.Visible, | ||
| IsEnabled = true, | ||
| }; | ||
| btn.ApplyTemplate(); | ||
| btn.TextPadding = new Thickness(7); | ||
| btn.Padding = new Thickness(5, 0, 5, 0); | ||
| btn.Margin = new Thickness(12, 0, 0, 0); | ||
| btn.Name += ModBase.GetUuid(); | ||
| var index = _buttons.Count + 1; | ||
| btn.Click += (_, _) => | ||
| { | ||
| if (_exited) return; | ||
| if (onClick is not null) | ||
| { | ||
| onClick(); | ||
| } | ||
| else | ||
| { | ||
| _exited = true; | ||
| _result = index; | ||
| Close(); | ||
| } | ||
| }; | ||
| _buttons.Add(btn); | ||
| PanBtn.Children.Add(btn); | ||
| return btn; | ||
| } | ||
|
|
||
| public event Action<int>? OnClosed; | ||
|
|
||
| private void OnLoad(object sender, RoutedEventArgs e) | ||
| { | ||
| try | ||
| { | ||
| if (_buttons.Count > 1 && _buttons[0].ColorType != MyButton.ColorState.Red) | ||
| _buttons[0].ColorType = MyButton.ColorState.Highlight; | ||
| if (_buttons.Count > 0) | ||
| _buttons[0].Focus(); | ||
|
There was a problem hiding this comment.
Useful? React with 👍 / 👎. |
||
|
|
||
| Opacity = 0d; | ||
| ModAnimation.AniStart( | ||
| ModAnimation.AaColor(ModMain.frmMain.PanMsgBackground, BlurBorder.BackgroundProperty, | ||
| (IsWarn | ||
| ? new ModBase.MyColor(140d, 80d, 0d, 0d) | ||
| : new ModBase.MyColor(90d, 0d, 0d, 0d)) - ModMain.frmMain.PanMsgBackground.Background, 200), | ||
| "PanMsgBackground Background"); | ||
| ModAnimation.AniStart( | ||
| new ModAnimation.AniData[] | ||
| { | ||
| ModAnimation.AaOpacity(this, 1d, 120, 60), | ||
| ModAnimation.AaDouble(i => TransformPos.Y += (double)i, | ||
| -TransformPos.Y, 300, 60, new ModAnimation.AniEaseOutBack(ModAnimation.AniEasePower.Weak)), | ||
| ModAnimation.AaDouble(i => TransformRotate.Angle += (double)i, | ||
| -TransformRotate.Angle, 300, 60, | ||
| new ModAnimation.AniEaseOutFluent(ModAnimation.AniEasePower.Weak)) | ||
| }, "DialogControl " + _uuid); | ||
|
|
||
| ModBase.Log("[Dialog] " + LabTitle.Text); | ||
| } | ||
| catch (Exception ex) | ||
| { | ||
| ModBase.Log(ex, "DialogControl 加载失败", ModBase.LogLevel.Hint); | ||
| } | ||
| } | ||
|
|
||
| public void Close() | ||
| { | ||
| if (_exited && _result == 0) | ||
| _result = -1; | ||
| _exited = true; | ||
|
|
||
| try | ||
| { | ||
| WaitFrame.Continue = false; | ||
| } | ||
| catch | ||
| { | ||
| // ignore | ||
| } | ||
|
|
||
| try | ||
| { | ||
| ComponentDispatcher.PopModal(); | ||
| } | ||
| catch | ||
| { | ||
| // ignore | ||
| } | ||
|
|
||
| OnClosed?.Invoke(_result); | ||
|
|
||
| ModAnimation.AniStart( | ||
| new ModAnimation.AniData[] | ||
| { | ||
| ModAnimation.AaCode(() => | ||
| { | ||
| if (!ModMain.WaitingMyMsgBox.Any()) | ||
| ModAnimation.AniStart(ModAnimation.AaColor(ModMain.frmMain.PanMsgBackground, | ||
| BlurBorder.BackgroundProperty, | ||
| new ModBase.MyColor(0d, 0d, 0d, 0d) - ModMain.frmMain.PanMsgBackground.Background, 200, | ||
| ease: new ModAnimation.AniEaseOutFluent(ModAnimation.AniEasePower.Weak))); | ||
| }, 30), | ||
| ModAnimation.AaOpacity(this, -Opacity, 80, 20), | ||
| ModAnimation.AaDouble(i => TransformPos.Y += (double)i, 20d - TransformPos.Y, | ||
| 150, 0, new ModAnimation.AniEaseOutFluent()), | ||
| ModAnimation.AaDouble(i => TransformRotate.Angle += (double)i, | ||
| 6d - TransformRotate.Angle, 150, 0, new ModAnimation.AniEaseInFluent(ModAnimation.AniEasePower.Weak)), | ||
| ModAnimation.AaCode(() => ((Grid)Parent)?.Children.Remove(this), after: true) | ||
| }, "DialogControl " + _uuid); | ||
| } | ||
|
|
||
| private void Drag(object sender, MouseButtonEventArgs e) | ||
| { | ||
| try | ||
| { | ||
| if (e.LeftButton == MouseButtonState.Pressed && e.GetPosition(ShapeLine).Y <= 2d) | ||
| ModMain.frmMain.DragMove(); | ||
| } | ||
| catch (Exception ex) | ||
| { | ||
| ModBase.Log(ex, "拖拽移动失败", ModBase.LogLevel.Hint); | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| <Grid x:Class="PCL.DialogControl" | ||
| xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| xmlns:my="clr-namespace:PCL" | ||
| RenderTransformOrigin="0,0.5" UseLayoutRounding="True" SnapsToDevicePixels="True" MinWidth="400" | ||
| HorizontalAlignment="Center" VerticalAlignment="Center" Margin="25"> | ||
| <Grid.RenderTransform> | ||
| <TransformGroup> | ||
| <RotateTransform x:Name="TransformRotate" Angle="-4" /> | ||
| <TranslateTransform x:Name="TransformPos" X="0" Y="40" /> | ||
| </TransformGroup> | ||
| </Grid.RenderTransform> | ||
| <Border Name="PanBorder" CornerRadius="7" Background="{DynamicResource ColorBrushBackground}"> | ||
| <Border.Effect> | ||
| <DropShadowEffect Color="{DynamicResource ColorObjectMsgBoxShadow}" BlurRadius="20" ShadowDepth="2" | ||
| RenderingBias="Performance" Opacity="0.8" x:Name="EffectShadow" /> | ||
| </Border.Effect> | ||
| <Grid Name="PanMain" VerticalAlignment="Top" Margin="22,22,22,23"> | ||
| <Grid.RowDefinitions> | ||
| <RowDefinition Height="Auto" /> | ||
| <RowDefinition Height="2" /> | ||
| <RowDefinition Height="13" /> | ||
| <RowDefinition Height="1*" /> | ||
| <RowDefinition Height="Auto" /> | ||
| </Grid.RowDefinitions> | ||
| <TextBlock Grid.Row="0" FontSize="23" TextTrimming="None" Foreground="{DynamicResource ColorBrush2}" | ||
| HorizontalAlignment="Left" Name="LabTitle" Margin="7,-1,70,9" | ||
| VerticalAlignment="Top" SnapsToDevicePixels="False" UseLayoutRounding="False" | ||
| MouseLeftButtonDown="Drag" /> | ||
| <Rectangle x:Name="ShapeLine" Grid.Row="1" Height="2" Fill="{Binding Foreground, ElementName=LabTitle}" /> | ||
| <my:MyScrollViewer Grid.Row="3" VerticalAlignment="Top" x:Name="ContentScrollViewer" Margin="0,0,0,17" | ||
| Padding="7,0,15,0" | ||
| VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" | ||
| DeltaMult="0.7"> | ||
| <ContentControl x:Name="ContentArea" Focusable="False" /> | ||
| </my:MyScrollViewer> | ||
| <StackPanel Grid.Row="4" Name="PanBtn" VerticalAlignment="Top" HorizontalAlignment="Right" | ||
| Margin="150,0,8,0" Orientation="Horizontal" /> | ||
| </Grid> | ||
| </Border> | ||
| </Grid> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When legacy callers use
MsgBoxWrapper.ShowWithCustomButtonswithMsgBoxButtonInfo.Valuevalues, this conversion drops the value and creates eachDialogButtonwith the defaultidof 0.Dialog_OnShowthen falls back to positional IDs, so selecting a button returns 1/2/3 instead of the caller-specified value; passbtn.Valueinto theDialogButtonid to keep the existing result contract.Useful? React with 👍 / 👎.