mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.14.0.116

Browse Source 
Former-commit-id: a1060d06ad743429ccc16477092659123892e701
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-06-01 08:44:40 +00:00
parent 87382fcb2d
commit f4dfa680ce
40 changed files with 52 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mcs/class/System.Windows.Forms/System.Windows.Forms/PropertyGrid.cs
View File

@ -937,6 +937,7 @@ namespace System.Windows.Forms
if (tabs != null && tabs.Count > 0) {
foreach (PropertyTab tab in tabs) {
PropertyToolBarButton button = new PropertyToolBarButton (tab);
button.Click += new EventHandler (toolbarbutton_clicked);
toolbar.Items.Add (button);
if (tab.Bitmap != null) {
tab.Bitmap.MakeTransparent ();
@ -986,7 +987,7 @@ namespace System.Windows.Forms
scopes.Clear ();
IList currentIntersection = (i == 0 ? (IList)tabAttribute.TabClasses : (IList)intersection);
for (int j=0; j < currentIntersection.Count; j++) {
if ((Type)intersection[j] == tabAttribute.TabClasses[j]) {
if ((Type)currentIntersection[j] == tabAttribute.TabClasses[j]) {
new_intersection.Add (tabAttribute.TabClasses[j]);
scopes.Add (tabAttribute.TabScopes[j]);
}
@ -1410,8 +1411,10 @@ namespace System.Windows.Forms
toRemove.Add (i);
}
foreach (int indexToRemove in toRemove) {
property_tabs.RemoveAt (indexToRemove);
property_tabs_scopes.RemoveAt (indexToRemove);
if (property_tabs.Count > indexToRemove)
property_tabs.RemoveAt (indexToRemove);
if (property_tabs_scopes.Count > indexToRemove)
property_tabs_scopes.RemoveAt (indexToRemove);
}
property_grid.RefreshToolbar (this);
}