Merge pull request #8894 from mono/jstedfast-debugger-spinner

[Debugger] Use an actual spinner instead of a static image

Author: sgmunn

main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValue/Mac/MacDebuggerObjectValueView.cs

@@ -112,6 +112,8 @@ protected override void Dispose (bool disposing)
 		}
 
 		readonly List<NSLayoutConstraint> constraints = new List<NSLayoutConstraint> ();
+		NSProgressIndicator spinner;
+		bool spinnerVisible;
 		NSImageView statusIcon;
 		bool statusIconVisible;
 		NSView colorPreview;
@@ -124,11 +126,17 @@ protected override void Dispose (bool disposing)
 
 		public MacDebuggerObjectValueView (MacObjectValueTreeView treeView) : base (treeView, "value")
 		{
+			spinner = new NSProgressIndicator (new CGRect (0, 0, ImageSize, ImageSize)) {
+				TranslatesAutoresizingMaskIntoConstraints = false,
+				Style = NSProgressIndicatorStyle.Spinning,
+				Indeterminate = true
+			};
+
 			statusIcon = new NSImageView {
 				TranslatesAutoresizingMaskIntoConstraints = false
 			};
 
-			colorPreview = new NSView (new CGRect (0, 0, 16, 16)) {
+			colorPreview = new NSView (new CGRect (0, 0, ImageSize, ImageSize)) {
 				TranslatesAutoresizingMaskIntoConstraints = false
 			};
 
@@ -184,6 +192,7 @@ protected override void UpdateContents ()
 			string valueButtonText = null;
 			var showViewerButton = false;
 			Color? previewColor = null;
+			bool showSpinner = false;
 			string strval;
 
 			if (Node.IsUnknown) {
@@ -207,8 +216,7 @@ protected override void UpdateContents ()
 					valueButtonText = GettextCatalog.GetString ("Show Value");
 			} else if (Node.IsEvaluating) {
 				strval = GettextCatalog.GetString ("Evaluating\u2026");
-
-				evaluateStatusIcon = "md-spinner-16";
+				showSpinner = true;
 
 				textColor = NSColor.FromCGColor (GetCGColor (Styles.ObjectValueTreeValueDisabledText));
 			} else if (Node.IsEnumerable) {
@@ -243,7 +251,7 @@ protected override void UpdateContents ()
 
 			OptimalWidth = MarginSize;
 
-			// First item: Status Icon
+			// First item: Status Icon -or- Spinner
 			if (evaluateStatusIcon != null) {
 				statusIcon.Image = GetImage (evaluateStatusIcon, Gtk.IconSize.Menu);
 
@@ -264,6 +272,26 @@ protected override void UpdateContents ()
 				statusIconVisible = false;
 			}
 
+			if (showSpinner) {
+				if (!spinnerVisible) {
+					AddSubview (spinner);
+					spinner.StartAnimation (this);
+					spinnerVisible = true;
+				}
+
+				constraints.Add (spinner.CenterYAnchor.ConstraintEqualToAnchor (CenterYAnchor));
+				constraints.Add (spinner.WidthAnchor.ConstraintEqualToConstant (ImageSize));
+				constraints.Add (spinner.HeightAnchor.ConstraintEqualToConstant (ImageSize));
+				views.Add (spinner);
+
+				OptimalWidth += ImageSize;
+				OptimalWidth += RowCellSpacing;
+			} else if (spinnerVisible) {
+				spinner.RemoveFromSuperview ();
+				spinner.StopAnimation (this);
+				spinnerVisible = false;
+			}
+
 			// Second Item: Color Preview
 			if (previewColor != null) {
 				colorPreview.Layer.BackgroundColor = GetCGColor (previewColor.Value);