Author: jpobst
Date: 2007-03-28 12:06:39 -0500 (Wed, 28 Mar 2007)
New Revision: 75087
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripComboBox.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripContainer.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripContentPanel.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDown.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDownMenu.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItem.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripManager.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripOverflow.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripProgressBar.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripSeparator.cs
Log:
2007-03-28 Jonathan Pobst <[EMAIL PROTECTED]>
* ToolStrip.cs: Remove MonoTODO for tooltips.
* ToolStripComboBox.cs: Fix MonoTODO for DropDownHeight and events.
* ToolStripContainer.cs: Add custom ControlCollection class.
* ToolStripContentPanel.cs: Fix Renderer setting to match MS behavior.
* ToolStripDropDown.cs: Add some missing properties/methods.
* ToolStripDropDownMenu.cs: Override OnLayout and SetDisplayedItems.
* ToolStripItem.cs: Remove MonoTODO for tooltips.
* ToolStripManager.cs: Add IsShortcutDefined.
* ToolStripOverflow.cs: Override LayoutEngine.
* ToolStripProgressBar.cs: Add MarqueeAnimationSpeed.
* ToolStripSeparator.cs: Add ImageKey.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-03-28 17:01:24 UTC (rev 75086)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-03-28 17:06:39 UTC (rev 75087)
@@ -1,3 +1,17 @@
+2007-03-28 Jonathan Pobst <[EMAIL PROTECTED]>
+
+ * ToolStrip.cs: Remove MonoTODO for tooltips.
+ * ToolStripComboBox.cs: Fix MonoTODO for DropDownHeight and events.
+ * ToolStripContainer.cs: Add custom ControlCollection class.
+ * ToolStripContentPanel.cs: Fix Renderer setting to match MS behavior.
+ * ToolStripDropDown.cs: Add some missing properties/methods.
+ * ToolStripDropDownMenu.cs: Override OnLayout and SetDisplayedItems.
+ * ToolStripItem.cs: Remove MonoTODO for tooltips.
+ * ToolStripManager.cs: Add IsShortcutDefined.
+ * ToolStripOverflow.cs: Override LayoutEngine.
+ * ToolStripProgressBar.cs: Add MarqueeAnimationSpeed.
+ * ToolStripSeparator.cs: Add ImageKey.
+
2007-03-28 Jackson Harper <[EMAIL PROTECTED]>
* TextControl.cs: If a char delete removes a line ending, we need
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs
2007-03-28 17:01:24 UTC (rev 75086)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs
2007-03-28 17:06:39 UTC (rev 75087)
@@ -409,7 +409,6 @@
}
}
- [MonoTODO ("Need 2.0 ToolTip to implement tool tips.")]
[DefaultValue (true)]
public bool ShowItemToolTips {
get { return this.show_item_tool_tips; }
@@ -1018,8 +1017,10 @@
private void MouseEnteredItem (ToolStripItem item)
{
- tooltip_currently_showing = item;
- ToolTipTimer.Start ();
+ if (this.show_item_tool_tips) {
+ tooltip_currently_showing = item;
+ ToolTipTimer.Start ();
+ }
}
private void MouseLeftItem (ToolStripItem item)
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripComboBox.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripComboBox.cs
2007-03-28 17:01:24 UTC (rev 75086)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripComboBox.cs
2007-03-28 17:06:39 UTC (rev 75087)
@@ -92,13 +92,12 @@
get { return (ComboBox)base.Control; }
}
- [MonoTODO ("Stub, will not actually affect anything.")]
[Browsable (true)]
[DefaultValue (106)]
[EditorBrowsable (EditorBrowsableState.Always)]
public int DropDownHeight {
- get { return 106; }
- set { }
+ get { return this.ComboBox.DropDownHeight; }
+ set { this.ComboBox.DropDownHeight = value; }
}
[DefaultValue (ComboBoxStyle.DropDown)]
@@ -297,14 +296,15 @@
{
}
- [MonoTODO ("Needs to hook into DropDownClosed and TextUpdate
when ComboBox 2.0 has them.")]
protected override void OnSubscribeControlEvents (Control
control)
{
base.OnSubscribeControlEvents (control);
this.ComboBox.DropDown += new EventHandler
(HandleDropDown);
+ this.ComboBox.DropDownClosed += new
EventHandler(HandleDropDownClosed);
this.ComboBox.DropDownStyleChanged += new EventHandler
(HandleDropDownStyleChanged);
this.ComboBox.SelectedIndexChanged += new EventHandler
(HandleSelectedIndexChanged);
+ this.ComboBox.TextUpdate += new
EventHandler(HandleTextUpdate);
}
protected virtual void OnTextUpdate (EventArgs e)
@@ -366,6 +366,11 @@
OnDropDown (e);
}
+ private void HandleDropDownClosed (object sender, EventArgs e)
+ {
+ OnDropDownClosed (e);
+ }
+
private void HandleDropDownStyleChanged (object sender,
EventArgs e)
{
OnDropDownStyleChanged (e);
@@ -375,6 +380,11 @@
{
OnSelectedIndexChanged (e);
}
+
+ private void HandleTextUpdate (object sender, EventArgs e)
+ {
+ OnTextUpdate (e);
+ }
#endregion
private class ToolStripComboBoxControl : ComboBox
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripContainer.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripContainer.cs
2007-03-28 17:01:24 UTC (rev 75086)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripContainer.cs
2007-03-28 17:06:39 UTC (rev 75087)
@@ -225,7 +225,7 @@
[EditorBrowsable (EditorBrowsableState.Advanced)]
protected override ControlCollection CreateControlsInstance ()
{
- return base.CreateControlsInstance ();
+ return new ToolStripContainerTypedControlCollection
(this);
}
protected override void OnSizeChanged (EventArgs e)
@@ -289,6 +289,15 @@
remove { base.ForeColorChanged -= value; }
}
#endregion
+
+ #region Private Class : ToolStripContainerTypedControlCollection
+ private class ToolStripContainerTypedControlCollection :
ControlCollection
+ {
+ public ToolStripContainerTypedControlCollection
(Control owner) : base (owner)
+ {
+ }
+ }
+ #endregion
}
}
#endif
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripContentPanel.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripContentPanel.cs
2007-03-28 17:01:24 UTC (rev 75086)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripContentPanel.cs
2007-03-28 17:06:39 UTC (rev 75087)
@@ -159,9 +159,12 @@
return this.renderer;
}
- set {
- this.renderer = value;
- this.OnRendererChanged (EventArgs.Empty);
+ set {
+ if (this.renderer != value) {
+ this.renderer = value;
+ this.render_mode =
ToolStripRenderMode.Custom;
+ this.OnRendererChanged
(EventArgs.Empty);
+ }
}
}
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDown.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDown.cs
2007-03-28 17:01:24 UTC (rev 75086)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDown.cs
2007-03-28 17:06:39 UTC (rev 75087)
@@ -39,6 +39,7 @@
{
private bool allow_transparency;
private bool auto_close;
+ private bool can_overflow;
private bool drop_shadow_enabled = true;
private double opacity = 1D;
private ToolStripItem owner_item;
@@ -51,7 +52,9 @@
this.auto_close = true;
is_visible = false;
+ this.DefaultDropDownDirection =
ToolStripDropDownDirection.Right;
this.GripStyle = ToolStripGripStyle.Hidden;
+ this.TopLevel = true;
}
#endregion
@@ -97,6 +100,11 @@
set { base.AutoSize = value; }
}
+ public new bool CanOverflow {
+ get { return this.can_overflow; }
+ set { this.can_overflow = value; }
+ }
+
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
public new ContextMenu ContextMenu {
@@ -168,6 +176,10 @@
set { base.GripStyle = value; }
}
+ public bool IsAutoGenerated {
+ get { return this is ToolStripOverflow; }
+ }
+
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
[DesignerSerializationVisibility
(DesignerSerializationVisibility.Hidden)]
@@ -196,6 +208,11 @@
}
}
+ [EditorBrowsable (EditorBrowsableState.Never)]
+ public new ToolStripOverflowButton OverflowButton {
+ get { return base.OverflowButton; }
+ }
+
[Browsable (false)]
[DefaultValue (null)]
public ToolStripItem OwnerItem {
@@ -425,6 +442,11 @@
base.CreateHandle ();
}
+ protected override LayoutSettings CreateLayoutSettings
(ToolStripLayoutStyle style)
+ {
+ return base.CreateLayoutSettings (style);
+ }
+
protected override void Dispose (bool disposing)
{
base.Dispose (disposing);
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDownMenu.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDownMenu.cs
2007-03-28 17:01:24 UTC (rev 75086)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDownMenu.cs
2007-03-28 17:06:39 UTC (rev 75087)
@@ -94,10 +94,20 @@
base.OnFontChanged (e);
}
+ protected override void OnLayout (LayoutEventArgs e)
+ {
+ base.OnLayout (e);
+ }
+
protected override void OnPaintBackground (PaintEventArgs
pevent)
{
base.OnPaintBackground (pevent);
}
+
+ protected override void SetDisplayedItems ()
+ {
+ base.SetDisplayedItems ();
+ }
#endregion
}
}
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItem.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItem.cs
2007-03-28 17:01:24 UTC (rev 75086)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItem.cs
2007-03-28 17:06:39 UTC (rev 75087)
@@ -223,8 +223,7 @@
[Browsable (false)]
[DefaultValue (AnchorStyles.Top | AnchorStyles.Left)]
[DesignerSerializationVisibility
(DesignerSerializationVisibility.Hidden)]
- public AnchorStyles Anchor
- {
+ public AnchorStyles Anchor {
get { return this.anchor; }
set { this.anchor = value; }
}
@@ -241,7 +240,6 @@
}
}
- [MonoTODO ("Need 2.0 ToolTip to implement tool tips.")]
[DefaultValue (false)]
public bool AutoToolTip {
get { return this.auto_tool_tip; }
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripManager.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripManager.cs
2007-03-28 17:01:24 UTC (rev 75086)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripManager.cs
2007-03-28 17:06:39 UTC (rev 75087)
@@ -117,6 +117,16 @@
return null;
}
+ public static bool IsShortcutDefined (Keys shortcut)
+ {
+ lock (menu_items)
+ foreach (ToolStripMenuItem tsmi in menu_items)
+ if (tsmi.ShortcutKeys == shortcut)
+ return true;
+
+ return false;
+ }
+
public static bool IsValidShortcut (Keys shortcut)
{
// Anything with an F1 - F12 is a shortcut
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripOverflow.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripOverflow.cs
2007-03-28 17:01:24 UTC (rev 75086)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripOverflow.cs
2007-03-28 17:06:39 UTC (rev 75087)
@@ -31,6 +31,7 @@
using System.Runtime.InteropServices;
using System.ComponentModel;
using System.Drawing;
+using System.Windows.Forms.Layout;
namespace System.Windows.Forms
{
@@ -38,6 +39,8 @@
[ClassInterface (ClassInterfaceType.AutoDispatch)]
public class ToolStripOverflow : ToolStripDropDown, IComponent,
IDisposable
{
+ private LayoutEngine layout_engine;
+
#region Public Constructors
public ToolStripOverflow (ToolStripItem parentItem)
{
@@ -46,6 +49,14 @@
#endregion
#region Public Properties
+ public override System.Windows.Forms.Layout.LayoutEngine
LayoutEngine {
+ get {
+ if (this.layout_engine == null)
+ this.layout_engine = new FlowLayout ();
+
+ return base.LayoutEngine;
+ }
+ }
#endregion
#region Protected Properties
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripProgressBar.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripProgressBar.cs
2007-03-28 17:01:24 UTC (rev 75086)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripProgressBar.cs
2007-03-28 17:06:39 UTC (rev 75087)
@@ -63,6 +63,12 @@
}
[DefaultValue (100)]
+ public int MarqueeAnimationSpeed {
+ get { return this.ProgressBar.MarqueeAnimationSpeed; }
+ set { this.ProgressBar.MarqueeAnimationSpeed = value; }
+ }
+
+ [DefaultValue (100)]
[RefreshProperties (RefreshProperties.Repaint)]
public int Maximum {
get { return this.ProgressBar.Maximum; }
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripSeparator.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripSeparator.cs
2007-03-28 17:01:24 UTC (rev 75086)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripSeparator.cs
2007-03-28 17:06:39 UTC (rev 75087)
@@ -127,6 +127,14 @@
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
[DesignerSerializationVisibility
(DesignerSerializationVisibility.Hidden)]
+ public new string ImageKey {
+ get { return base.ImageKey; }
+ set { base.ImageKey = value; }
+ }
+
+ [Browsable (false)]
+ [EditorBrowsable (EditorBrowsableState.Never)]
+ [DesignerSerializationVisibility
(DesignerSerializationVisibility.Hidden)]
public new ToolStripItemImageScaling ImageScaling {
get { return base.ImageScaling; }
set { base.ImageScaling = value; }
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches