diff options
author | Everaldo Canuto <everaldo@mono-cvs.ximian.com> | 2007-01-23 20:22:21 +0300 |
---|---|---|
committer | Everaldo Canuto <everaldo@mono-cvs.ximian.com> | 2007-01-23 20:22:21 +0300 |
commit | c7991446a1096fa6cac91a5e7de19c5e7ddc4d71 (patch) | |
tree | adda707046edf6d4b0c4a4003f7f0123158fa34d | |
parent | 1443380beb7cd5befc4adc85fb76120739b1850c (diff) |
2007-01-23 Everaldo Canuto <everaldo@simios.org>
* ToolBar.cs: Add status fields to ToolBarButtonInfo.
svn path=/trunk/mcs/; revision=71526
-rw-r--r-- | mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog | 4 | ||||
-rw-r--r-- | mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs | 12 |
2 files changed, 15 insertions, 1 deletions
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog index 7a52aff99b4..fe06c55176b 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog @@ -1,3 +1,7 @@ +2007-01-23 Everaldo Canuto <everaldo@simios.org> + + * ToolBar.cs: Add status fields to ToolBarButtonInfo. + 2007-01-23 Andreia Gaita <avidigal@novell.com> * TreeNode.cs: Add new 2.0 ImageKey and SelectedImageKey properties. 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 c2c21f49382..7fcab90ee8b 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs @@ -889,7 +889,7 @@ namespace System.Windows.Forms } } - bool LayoutToolBar () + private bool LayoutToolBar () { bool changed = false; Theme theme = ThemeEngine.Current; @@ -1139,6 +1139,11 @@ namespace System.Windows.Forms private Rectangle bounds; // Toolbar button bounds private Rectangle image_rect; // Image button bounds private Rectangle text_rect; // Text button bounds + + private bool dd_pressed = false; // to check for a mouse down on dropdown rect + private bool hilight = false; // to hilight buttons in flat style + private bool inside = false; // to handle the mouse move event with mouse pressed + private bool pressed = false; // this is to check for mouse down on a button #endregion @@ -1189,6 +1194,11 @@ namespace System.Windows.Forms } } + public bool Pressed { + get { return (pressed && inside); } + set { pressed = value; } + } + #endregion Properties #region Methods |