diff options
| author | sancheolz <sancheolz@gmail.com> | 2019-04-08 19:02:32 +0300 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2019-04-11 11:51:59 +0300 |
| commit | 4eb4173b57af5c2403f2b68170229768a44f7e2d (patch) | |
| tree | ceba952c524a7f2c3049ba569006e9932e7b05b4 /mcs/class/System.Windows.Forms | |
| parent | 8ba5a5201f0a7aeb35d33709186ddfa0eb4d9d68 (diff) | |
[WinForms] Fix displayed image in TreeNode when ImageIndex set to -2
When ImageIndex in TreeNode set to -2 must not displayed any image
Diffstat (limited to 'mcs/class/System.Windows.Forms')
| -rw-r--r-- | mcs/class/System.Windows.Forms/System.Windows.Forms/TreeNode.cs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/TreeNode.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/TreeNode.cs index 1d55c35d5fe..b16d06349f6 100644 --- a/mcs/class/System.Windows.Forms/System.Windows.Forms/TreeNode.cs +++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/TreeNode.cs @@ -1071,7 +1071,7 @@ namespace System.Windows.Forms return TreeView.ImageList.Images.IndexOfKey (selected_image_key); if (!string.IsNullOrEmpty (TreeView.SelectedImageKey)) return TreeView.ImageList.Images.IndexOfKey (TreeView.SelectedImageKey); - if (TreeView.SelectedImageIndex >= 0) + if (selected_image_index == -1 && TreeView.SelectedImageIndex >= 0) return TreeView.SelectedImageIndex; } else { if (image_index >= 0) @@ -1080,12 +1080,9 @@ namespace System.Windows.Forms return TreeView.ImageList.Images.IndexOfKey (image_key); if (!string.IsNullOrEmpty (TreeView.ImageKey)) return TreeView.ImageList.Images.IndexOfKey (TreeView.ImageKey); - if (TreeView.ImageIndex >= 0) + if (image_index == -1 && TreeView.ImageIndex >= 0) return TreeView.ImageIndex; } - - if (TreeView.ImageList.Images.Count > 0) - return 0; return -1; } |