[corlib] Fix MethodInfo::ToString () to properly format generic structs. Fixes BXC...

[mono.git] / mcs / class / System.Design / System.ComponentModel.Design / SelectionService.cs

diff --git a/mcs/class/System.Design/System.ComponentModel.Design/SelectionService.cs b/mcs/class/System.Design/System.ComponentModel.Design/SelectionService.cs
index e4b2519559c11bb8a4be5f284673fd564aab7b42..93b99b837abec1f38756a8c8bb4e33da2b078463 100644 (file)
--- a/mcs/class/System.Design/System.ComponentModel.Design/SelectionService.cs
+++ b/mcs/class/System.Design/System.ComponentModel.Design/SelectionService.cs
@@ -105,7 +105,6 @@ namespace System.ComponentModel.Design
                                        IDesignerHost designerHost = _serviceProvider.GetService (typeof (IDesignerHost)) as IDesignerHost;
                                        if (designerHost != null)
                                                return designerHost.RootComponent;
-
                                }
                                return null;
                        }
@@ -216,14 +215,20 @@ namespace System.ComponentModel.Design
                        }
 
                        if (remove) {
+                               bool rootRemoved = false;
                                foreach (object component in components) {
-                                       if (component is IComponent && _selection.Contains (component)) {
+                                       if (component is IComponent && _selection.Contains (component))
                                                _selection.Remove (component);
-                                       }
+                                       if (component == this.RootComponent)
+                                               rootRemoved = true;
                                }
                                if (_selection.Count == 0) {
-                                       _primarySelection = this.RootComponent;
-                                       _selection.Add (this.RootComponent);
+                                       if (rootRemoved) {
+                                               _primarySelection = null;
+                                       } else {
+                                               _primarySelection = this.RootComponent;
+                                               _selection.Add (this.RootComponent);
+                                       }
                                }
                        }
 
@@ -252,7 +257,7 @@ namespace System.ComponentModel.Design
                                }
 
                                if (!this.GetComponentSelected (primarySelection))
-                                       _selection.Add (_primarySelection);
+                                       _selection.Add (primarySelection);
 
                                _primarySelection = (IComponent) primarySelection;
                        }