From fd78972c2f6c7097158f1a90223c2dd4617126da Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sun, 24 Nov 2024 22:12:43 +0800
Subject: [PATCH] Improve OK MessageBoxEx display style

---
 Flow.Launcher.Core/MessageBoxEx.xaml    | 23 +++++++++++++++++++----
 Flow.Launcher.Core/MessageBoxEx.xaml.cs | 18 +++++++++++++-----
 2 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/Flow.Launcher.Core/MessageBoxEx.xaml b/Flow.Launcher.Core/MessageBoxEx.xaml
index 2788a7648..3467b3a0c 100644
--- a/Flow.Launcher.Core/MessageBoxEx.xaml
+++ b/Flow.Launcher.Core/MessageBoxEx.xaml
@@ -60,8 +60,12 @@
                 </Grid>
             </StackPanel>
         </StackPanel>
-        <StackPanel Grid.Row="1" Margin="30 0 30 24">
-            <Grid Grid.Column="0" Margin="0 0 0 12">
+        <Grid Grid.Row="1" Margin="30 0 30 24">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid Grid.Row="0" Margin="0 0 0 12">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" />
                     <ColumnDefinition Width="*" />
@@ -91,14 +95,25 @@
             </Grid>
             <TextBlock
                 x:Name="DescTextBlock"
-                Grid.Column="1"
+                Grid.Row="1"
                 MaxWidth="400"
                 Margin="0 0 26 0"
                 HorizontalAlignment="Stretch"
                 FontSize="14"
                 TextAlignment="Left"
                 TextWrapping="Wrap" />
-        </StackPanel>
+            <TextBlock
+                x:Name="DescOnlyTextBlock"
+                Grid.Row="0"
+                Grid.RowSpan="2"
+                MaxWidth="400"
+                Margin="0 0 26 0"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Center"
+                FontSize="14"
+                TextAlignment="Left"
+                TextWrapping="Wrap" />
+        </Grid>
         <Border
             Grid.Row="2"
             Margin="0 0 0 0"
diff --git a/Flow.Launcher.Core/MessageBoxEx.xaml.cs b/Flow.Launcher.Core/MessageBoxEx.xaml.cs
index 3e04657dc..911e6b5b8 100644
--- a/Flow.Launcher.Core/MessageBoxEx.xaml.cs
+++ b/Flow.Launcher.Core/MessageBoxEx.xaml.cs
@@ -39,7 +39,7 @@ namespace Flow.Launcher.Core
         /// 1 parameter
         public static MessageBoxResult Show(string messageBoxText)
         {
-            return Show(string.Empty, messageBoxText, MessageBoxButton.OK, MessageBoxImage.None);
+            return Show(messageBoxText, string.Empty, MessageBoxButton.OK, MessageBoxImage.None);
         }
 
         // 2 parameter
@@ -80,11 +80,19 @@ namespace Flow.Launcher.Core
         public static MessageBoxResult Show(string messageBoxText, string title, MessageBoxButton button, MessageBoxImage image)
         {
             msgBox = new MessageBoxEx();
-            msgBox.TitleTextBlock.Text = title;
-            msgBox.DescTextBlock.Text = messageBoxText;
-            msgBox.Title = title;
+            if (title == string.Empty && button == MessageBoxButton.OK && image == MessageBoxImage.None)
+            {
+                msgBox.DescOnlyTextBlock.Text = messageBoxText;
+                msgBox.Title = messageBoxText;
+            }
+            else
+            {
+                msgBox.TitleTextBlock.Text = title;
+                msgBox.DescTextBlock.Text = messageBoxText;
+                msgBox.Title = title;
+                SetImageOfMessageBox(image);
+            }
             SetVisibilityOfButtons(button);
-            SetImageOfMessageBox(image);
             msgBox.ShowDialog();
             return _result;
         }