Trigger buttons click event for DropDown Button

svn path=/trunk/mcs/; revision=68214

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index 73ec29a4e7317e71c31dc7950f06ca0f95f686ee..f0d10f8e9ed1eef530a2e6c91fb251402337aa77 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-20  Everaldo Canuto  <everaldo@simios.org>
+
+       * Toolbar.cs: Triggers button click event when click on icon
+       of dropdown ToolBarButton. Fixes #79912.
+       
 2006-11-20  Rolf Bjarne Kvinge  <RKvinge@novell.com>
 
        * Theme.cs:

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
index fc202a2446e6bf186fa3e568ea13cac0ecc0c455..f7a55c858ddeef129d4486eccb7a2a3207934e3c 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
@@ -612,8 +612,11 @@ namespace System.Windows.Forms
                                        // We don't redraw the dropdown rect.
                                        if (button.Style == ToolBarButtonStyle.DropDownButton) {
                                                Rectangle rect = button.Rectangle;
-                                               rect.Width = ThemeEngine.Current.ToolBarDropDownWidth;
-                                               rect.X = button.Rectangle.Right - rect.Width;
+                                               if (DropDownArrows) {
+                                                       rect.Width = ThemeEngine.Current.ToolBarDropDownWidth;
+                                                       rect.X = button.Rectangle.Right - rect.Width;
+                                               }
+                                               
                                                if (rect.Contains (loc)) {
                                                        if (button.DropDownMenu != null) {
                                                                button.dd_pressed = true;
@@ -621,12 +624,11 @@ namespace System.Windows.Forms
                                                        }
                                                        break;
                                                }
-                                       } else if ((me.Button & MouseButtons.Left) == MouseButtons.Left) {
-                                               button.pressed = true;
-                                               button.inside = true;
-                                               button.InvalidateBorder ();
-                                               break;
                                        }
+                                       button.pressed = true;
+                                       button.inside = true;
+                                       button.InvalidateBorder ();
+                                       break;
                                }
                        }
                }