Progressdialog improvements

MahApps.Metro/Controls/Dialogs/ProgressDialog.cs

@@ -29,6 +29,7 @@ internal ProgressDialog(MetroWindow parentWindow, MetroDialogSettings settings)
                 ProgressBarForeground = Brushes.White;
             }
         }
+
         internal ProgressDialog(MetroWindow parentWindow)
             : this(parentWindow, null)
         { }
@@ -69,5 +70,33 @@ internal CancellationToken CancellationToken
         {
             get { return DialogSettings.CancellationToken; }
         }
+
+        internal double Minimum
+        {
+            get { return PART_ProgressBar.Minimum; }
+            set { PART_ProgressBar.Minimum = value; }
+        }
+
+        internal double Maximum
+        {
+            get { return PART_ProgressBar.Maximum; }
+            set { PART_ProgressBar.Maximum = value; }
+        }
+
+        internal double ProgressValue
+        {
+            get { return PART_ProgressBar.Value; }
+            set
+            {
+                PART_ProgressBar.IsIndeterminate = false;
+                PART_ProgressBar.Value = value;
+                PART_ProgressBar.ApplyTemplate();
+            }
+        }
+
+        internal void SetIndeterminate()
+        {
+            PART_ProgressBar.IsIndeterminate = true;
+        }
     }
 }

MahApps.Metro/Controls/Dialogs/ProgressDialogController.cs

@@ -15,18 +15,24 @@ public class ProgressDialogController
         /// <summary>
         /// Gets if the wrapped ProgressDialog is open.
         /// </summary>
+        [Obsolete("Use the Closed event instead")]
         public bool IsOpen { get; private set; }
 
+        /// <summary>
+        /// This event is raised when the associated <see cref="ProgressDialog"/> was closed.
+        /// </summary>
+        public event EventHandler Closed;
+
         internal ProgressDialogController(ProgressDialog dialog, Func<Task> closeCallBack)
         {
             WrappedDialog = dialog;
             CloseCallback = closeCallBack;
 
             IsOpen = dialog.IsVisible;
 
-            WrappedDialog.PART_NegativeButton.Dispatcher.Invoke(new Action(() => {
+            InvokeAction(() => {
                 WrappedDialog.PART_NegativeButton.Click += PART_NegativeButton_Click;
-            }));
+            });
 
             dialog.CancellationToken.Register(() =>
             {
@@ -41,15 +47,15 @@ private void PART_NegativeButton_Click(object sender, RoutedEventArgs e)
                 WrappedDialog.PART_NegativeButton.IsEnabled = false;
             };
 
-            this.InvokeAction(action);
+            InvokeAction(action);
         }
 
         /// <summary>
         /// Sets the ProgressBar's IsIndeterminate to true. To set it to false, call SetProgress.
         /// </summary>
         public void SetIndeterminate()
         {
-            this.InvokeAction(() => WrappedDialog.PART_ProgressBar.IsIndeterminate = true);
+            InvokeAction(() => WrappedDialog.SetIndeterminate());
         }
 
         /// <summary>
@@ -58,7 +64,7 @@ public void SetIndeterminate()
         /// <param name="value"></param>
         public void SetCancelable(bool value)
         {
-            this.InvokeAction(() => WrappedDialog.IsCancelable = value);
+            InvokeAction(() => WrappedDialog.IsCancelable = value);
         }
 
         /// <summary>
@@ -68,35 +74,33 @@ public void SetCancelable(bool value)
         public void SetProgress(double value)
         {
             Action action = () => {
-                if (value < WrappedDialog.PART_ProgressBar.Minimum || value > WrappedDialog.PART_ProgressBar.Maximum)
+                if (value < WrappedDialog.Minimum || value > WrappedDialog.Maximum)
                 {
                     throw new ArgumentOutOfRangeException("value");
                 }
 
-                WrappedDialog.PART_ProgressBar.IsIndeterminate = false;
-                WrappedDialog.PART_ProgressBar.Value = value;
-                WrappedDialog.PART_ProgressBar.ApplyTemplate();
+                WrappedDialog.ProgressValue = value;
             };
 
-            this.InvokeAction(action);
+            InvokeAction(action);
         }
 
         /// <summary>
         ///  Gets/Sets the minimum restriction of the progress Value property
         /// </summary>
         public double Minimum
         {
-            get { return this.InvokeFunc(() => WrappedDialog.PART_ProgressBar.Minimum); }
-            set { this.InvokeAction(() => WrappedDialog.PART_ProgressBar.Minimum = value); }
+            get { return InvokeFunc(() => WrappedDialog.Minimum); }
+            set { InvokeAction(() => WrappedDialog.Minimum = value); }
         }
 
         /// <summary>
         ///  Gets/Sets the maximum restriction of the progress Value property
         /// </summary>
         public double Maximum
         {
-            get { return this.InvokeFunc(() => WrappedDialog.PART_ProgressBar.Maximum); }
-            set { this.InvokeAction(() => WrappedDialog.PART_ProgressBar.Maximum = value); }
+            get { return InvokeFunc(() => WrappedDialog.Maximum); }
+            set { InvokeAction(() => WrappedDialog.Maximum = value); }
         }
 
         /// <summary>
@@ -105,7 +109,7 @@ public double Maximum
         /// <param name="message">The message to be set.</param>
         public void SetMessage(string message)
         {
-            this.InvokeAction(() => WrappedDialog.Message = message);
+            InvokeAction(() => WrappedDialog.Message = message);
         }
 
         /// <summary>
@@ -114,7 +118,7 @@ public void SetMessage(string message)
         /// <param name="title">The title to be set.</param>
         public void SetTitle(string title)
         {
-            this.InvokeAction(() => WrappedDialog.Title = title);
+            InvokeAction(() => WrappedDialog.Title = title);
         }
 
         /// <summary>
@@ -129,18 +133,23 @@ public void SetTitle(string title)
         public Task CloseAsync()
         {
             Action action = () => {
-                if (!IsOpen)
+                if (!WrappedDialog.IsVisible)
                 {
                     throw new InvalidOperationException();
                 }
                 WrappedDialog.Dispatcher.VerifyAccess();
                 WrappedDialog.PART_NegativeButton.Click -= PART_NegativeButton_Click;
             };
 
-            this.InvokeAction(action);
+            InvokeAction(action);
 
-            return CloseCallback().ContinueWith(x => WrappedDialog.Dispatcher.Invoke(new Action(() => {
+            return CloseCallback().ContinueWith(_ => InvokeAction(new Action(() => {
                 IsOpen = false;
+
+                var handler = Closed;
+                if (handler != null) {
+                    handler(this, EventArgs.Empty);
+                }
             })));
         }
 
@@ -152,7 +161,7 @@ private double InvokeFunc(Func<double> getValueFunc)
             }
             else
             {
-                return (double)this.WrappedDialog.Dispatcher.Invoke(new Func<double>(getValueFunc));
+                return (double)WrappedDialog.Dispatcher.Invoke(new Func<double>(getValueFunc));
             }
         }
 
@@ -164,7 +173,7 @@ private void InvokeAction(Action setValueAction)
             }
             else
             {
-                WrappedDialog.Dispatcher.Invoke(new Action(setValueAction));
+                WrappedDialog.Dispatcher.Invoke(setValueAction);
             }
         }
     }

MahApps.Metro/Themes/Dialogs/ProgressDialog.xaml

@@ -39,7 +39,6 @@
                                    Height="6"
                                    EllipseDiameter="5"
                                    Panel.ZIndex="5"
-                                   IsIndeterminate="True"
                                    Minimum="0.0"
                                    Maximum="1.0"
                                    Foreground="{Binding ProgressBarForeground, RelativeSource={RelativeSource AncestorType=Dialogs:ProgressDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"

docs/release-notes/1.2.0.md

@@ -77,6 +77,8 @@ This is a bug fix and feature release of MahApps.Metro v1.2.0.
 	+ introduce `VirtualisedMetroTreeView`
 - SelectAllOnFocus for input and login dialogs #1750
 - New `MetroValidationPopup` style and new `CloseOnMouseLeftButtonDown` dependency property #2058 #1469
+- Progress bar in `ProgressDialog` is not set to Indetermined by default anymore, must be set explicitly by calling `ProgressDialogController.SetIndeterminate()` #2097
+- Added `Closed` event to `ProgressDialogController` #2097
 
 # Bugfixes
 

samples/MetroDemo/MainWindow.xaml.cs

@@ -246,6 +246,7 @@ private async void ShowLoginDialogPasswordPreview(object sender, RoutedEventArgs
         private async void ShowProgressDialog(object sender, RoutedEventArgs e)
         {
             var controller = await this.ShowProgressAsync("Please wait...", "We are baking some cupcakes!");
+            controller.SetIndeterminate();
 
             await TaskEx.Delay(5000);