X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FManaged.Windows.Forms%2FSystem.Windows.Forms%2FControl.cs;h=a23b86308881afcbfde200ab39205cadbcc11071;hb=0119308d4912095ec75ea933d3cfcb5e067f20a4;hp=221d2481d5009ff1a8f185f18daef139eb75514a;hpb=94ce5c5aaf912e55f106bbf3250612b02ac850b5;p=mono.git diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs index 221d2481d50..a23b8630888 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs @@ -17,7 +17,7 @@ // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -// Copyright (c) 2004-2005 Novell, Inc. +// Copyright (c) 2004-2006 Novell, Inc. // // Authors: // Peter Bartok pbartok@novell.com @@ -39,6 +39,7 @@ using System.ComponentModel.Design.Serialization; using System.Collections; using System.Diagnostics; using System.Drawing; +using System.Drawing.Drawing2D; using System.Reflection; using System.Runtime.InteropServices; using System.Security; @@ -119,6 +120,12 @@ namespace System.Windows.Forms private ControlBindingsCollection data_bindings; +#if NET_2_0 + internal bool use_compatible_text_rendering; + static internal bool verify_thread_handle; + private Padding padding; +#endif + #endregion // Local Variables #region Private Classes @@ -157,10 +164,6 @@ namespace System.Windows.Forms #region Public Classes [ComVisible(true)] public class ControlAccessibleObject : AccessibleObject { - #region ControlAccessibleObject Local Variables - private Control owner; - #endregion // ControlAccessibleObject Local Variables - #region ControlAccessibleObject Constructors public ControlAccessibleObject(Control ownerControl) { this.owner = ownerControl; @@ -259,7 +262,7 @@ namespace System.Windows.Forms public class ControlCollection : IList, ICollection, ICloneable, IEnumerable { #region ControlCollection Local Variables private ArrayList list; - private ArrayList impl_list; + internal ArrayList impl_list; private Control [] all_controls; internal Control owner; #endregion // ControlCollection Local Variables @@ -278,7 +281,7 @@ namespace System.Windows.Forms } } - public virtual bool IsReadOnly { + public bool IsReadOnly { get { return list.IsReadOnly; } @@ -349,7 +352,9 @@ namespace System.Windows.Forms impl_list = new ArrayList (); all_controls = null; impl_list.Add (control); + control.ChangeParent (owner); + control.InitLayout (); owner.UpdateZOrder (); owner.PerformLayout (control, "Parent"); owner.OnControlAdded (new ControlEventArgs (control)); @@ -437,7 +442,7 @@ namespace System.Windows.Forms return Contains (value) || ImplicitContains (value); } - public virtual void CopyTo (Array array, int index) + public void CopyTo (Array array, int index) { list.CopyTo(array, index); } @@ -482,9 +487,11 @@ namespace System.Windows.Forms if (impl_list == null) return (Control []) list.ToArray (typeof (Control)); + Control [] res = new Control [list.Count + impl_list.Count]; - list.CopyTo (res); - impl_list.CopyTo (res, list.Count); + impl_list.CopyTo (res); + list.CopyTo (res, impl_list.Count); + return res; } @@ -539,14 +546,13 @@ namespace System.Windows.Forms return; } - RemoveAt(old_index); + list.RemoveAt(old_index); if (newIndex>list.Count) { list.Add(child); } else { list.Insert(newIndex, child); } - child.parent = owner; owner.UpdateZOrder(); } #endregion // ControlCollection Private Instance Methods @@ -575,12 +581,6 @@ namespace System.Windows.Forms } } - bool IList.IsReadOnly { - get { - return list.IsReadOnly; - } - } - bool ICollection.IsSynchronized { get { return list.IsSynchronized; @@ -639,12 +639,6 @@ namespace System.Windows.Forms list.Remove(value); } - void ICollection.CopyTo(Array array, int index) { - if (list.Count>0) { - list.CopyTo(array, index); - } - } - Object ICloneable.Clone() { ControlCollection clone = new ControlCollection(this.owner); clone.list=(ArrayList)list.Clone(); // FIXME: Do we need this? @@ -656,7 +650,6 @@ namespace System.Windows.Forms #region Public Constructors public Control() { - creator_thread = Thread.CurrentThread; anchor_style = AnchorStyles.Top | AnchorStyles.Left; @@ -682,6 +675,11 @@ namespace System.Windows.Forms dist_top = 0; dist_bottom = 0; +#if NET_2_0 + use_compatible_text_rendering = Application.use_compatible_text_rendering; + padding = new Padding(0); +#endif + control_style = ControlStyles.UserPaint | ControlStyles.AllPaintingInWmPaint | ControlStyles.Selectable | ControlStyles.StandardClick | ControlStyles.StandardDoubleClick; @@ -695,7 +693,7 @@ namespace System.Windows.Forms child_controls = CreateControlsInstance(); client_size = new Size(DefaultSize.Width, DefaultSize.Height); client_rect = new Rectangle(0, 0, DefaultSize.Width, DefaultSize.Height); - XplatUI.CalculateWindowRect(IntPtr.Zero, ref client_rect, CreateParams.Style, CreateParams.ExStyle, null, out bounds); + XplatUI.CalculateWindowRect(ref client_rect, CreateParams.Style, CreateParams.ExStyle, null, out bounds); if ((CreateParams.Style & (int)WindowStyles.WS_CHILD) == 0) { bounds.X=-1; bounds.Y=-1; @@ -733,7 +731,6 @@ namespace System.Windows.Forms private delegate void RemoveDelegate(object c); protected override void Dispose(bool disposing) { - is_disposed = true; if (dc_mem!=null) { dc_mem.Dispose(); dc_mem=null; @@ -753,6 +750,8 @@ namespace System.Windows.Forms DestroyHandle(); controls.Remove(this); } + is_disposed = true; + base.Dispose(disposing); } #endregion // Public Constructors @@ -829,6 +828,29 @@ namespace System.Windows.Forms XplatUI.ClientToScreen (Handle, ref x, ref y); } + private bool IsRecreating { + get { + if (is_recreating) { + return true; + } + + if (parent != null) { + return parent.IsRecreating; + } + + return false; + } + } + + private bool ParentIsRecreating { + get { + if (parent != null) { + return parent.IsRecreating; + } + return false; + } + } + internal Graphics DeviceContext { get { if (dc_mem==null) { @@ -938,6 +960,26 @@ namespace System.Windows.Forms // This method exists so controls overriding OnPaintBackground can have default background painting done internal virtual void PaintControlBackground (PaintEventArgs pevent) { + if (GetStyle(ControlStyles.SupportsTransparentBackColor) && (BackColor.A != 0xff)) { + if (parent != null) { + PaintEventArgs parent_pe; + GraphicsState state; + + parent_pe = new PaintEventArgs(pevent.Graphics, new Rectangle(pevent.ClipRectangle.X + Left, pevent.ClipRectangle.Y + Top, pevent.ClipRectangle.Width, pevent.ClipRectangle.Height)); + + state = parent_pe.Graphics.Save(); + parent_pe.Graphics.TranslateTransform(-Left, -Top); + parent.OnPaintBackground(parent_pe); + parent_pe.Graphics.Restore(state); + + state = parent_pe.Graphics.Save(); + parent_pe.Graphics.TranslateTransform(-Left, -Top); + parent.OnPaint(parent_pe); + parent_pe.Graphics.Restore(state); + parent_pe.SetGraphics(null); + } + } + if (background_image == null) { pevent.Graphics.FillRectangle(ThemeEngine.Current.ResPool.GetSolidBrush(BackColor), new Rectangle(pevent.ClipRectangle.X - 1, pevent.ClipRectangle.Y - 1, pevent.ClipRectangle.Width + 2, pevent.ClipRectangle.Height + 2)); return; @@ -948,7 +990,7 @@ namespace System.Windows.Forms void DrawBackgroundImage (Graphics g) { - using (TextureBrush b = new TextureBrush (background_image)) { + using (TextureBrush b = new TextureBrush (background_image, WrapMode.Tile)) { g.FillRectangle (b, ClientRectangle); } } @@ -1133,16 +1175,18 @@ namespace System.Windows.Forms return found; } - private void HandleClick(int clicks) { + private void HandleClick(int clicks, MouseEventArgs me) { if (GetStyle(ControlStyles.StandardClick)) { - if (clicks > 1) { - if (GetStyle(ControlStyles.StandardDoubleClick)) { - OnDoubleClick(EventArgs.Empty); - } else { - OnClick(EventArgs.Empty); - } + if ((clicks > 1) && GetStyle(ControlStyles.StandardDoubleClick)) { +#if !NET_2_0 + OnDoubleClick(EventArgs.Empty); } else { OnClick(EventArgs.Empty); +#else + OnDoubleClick(me); + } else { + OnClick(me); +#endif } } } @@ -1223,9 +1267,9 @@ namespace System.Windows.Forms } private void UpdateDistances() { - dist_left = bounds.X; - dist_top = bounds.Y; if ((parent != null) && (parent.layout_suspended == 0)) { + dist_left = bounds.X; + dist_top = bounds.Y; dist_right = parent.ClientSize.Width - bounds.X - bounds.Width; dist_bottom = parent.ClientSize.Height - bounds.Y - bounds.Height; } @@ -1273,10 +1317,12 @@ namespace System.Windows.Forms [MonoTODO] public static bool CheckForIllegalCrossThreadCalls { - set { - } get { - return false; + return verify_thread_handle; + } + + set { + verify_thread_handle = value; } } #endif @@ -1310,6 +1356,7 @@ namespace System.Windows.Forms [Localizable(true)] [DefaultValue(null)] + [MWFCategory("Accessibility")] public string AccessibleDescription { get { return AccessibilityObject.description; @@ -1322,6 +1369,7 @@ namespace System.Windows.Forms [Localizable(true)] [DefaultValue(null)] + [MWFCategory("Accessibility")] public string AccessibleName { get { return AccessibilityObject.Name; @@ -1345,6 +1393,7 @@ namespace System.Windows.Forms } [DefaultValue(false)] + [MWFCategory("Behavior")] public virtual bool AllowDrop { get { return allow_drop; @@ -1354,14 +1403,17 @@ namespace System.Windows.Forms if (allow_drop == value) return; allow_drop = value; - UpdateStyles(); - XplatUI.SetAllowDrop (Handle, value); + if (IsHandleCreated) { + UpdateStyles(); + XplatUI.SetAllowDrop (Handle, value); + } } } [Localizable(true)] [RefreshProperties(RefreshProperties.Repaint)] - [DefaultValue(AnchorStyles.Top | AnchorStyles.Left)] + [DefaultValue(AnchorStyles.Top | AnchorStyles.Left)] + [MWFCategory("Layout")] public virtual AnchorStyles Anchor { get { return anchor_style; @@ -1376,12 +1428,31 @@ namespace System.Windows.Forms } } +#if NET_2_0 + // XXX: Implement me! + bool auto_size; + + public virtual bool AutoSize { + get { + Console.Error.WriteLine("Unimplemented: Control::get_AutoSize()"); + return auto_size; + } + set { + Console.Error.WriteLine("Unimplemented: Control::set_AutoSize(bool)"); + auto_size = value; + } + } +#endif // NET_2_0 + [DispId(-501)] + [MWFCategory("Appearance")] public virtual Color BackColor { get { if (background_color.IsEmpty) { if (parent!=null) { - return parent.BackColor; + Color pcolor = parent.BackColor; + if (pcolor.A == 0xff || GetStyle(ControlStyles.SupportsTransparentBackColor)) + return pcolor; } return DefaultBackColor; } @@ -1389,6 +1460,10 @@ namespace System.Windows.Forms } set { + if (!value.IsEmpty && (value.A != 0xff) && !GetStyle(ControlStyles.SupportsTransparentBackColor)) { + throw new ArgumentException("Transparent background colors are not supported on this control"); + } + background_color=value; SetChildColor(this); OnBackColorChanged(EventArgs.Empty); @@ -1398,6 +1473,7 @@ namespace System.Windows.Forms [Localizable(true)] [DefaultValue(null)] + [MWFCategory("Appearance")] public virtual Image BackgroundImage { get { return background_image; @@ -1458,7 +1534,7 @@ namespace System.Windows.Forms [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public bool CanFocus { get { - if (Visible && is_enabled && GetStyle(ControlStyles.Selectable)) { + if (IsHandleCreated && Visible && Enabled) { return true; } return false; @@ -1472,11 +1548,11 @@ namespace System.Windows.Forms get { Control parent; - if (!GetStyle(ControlStyles.Selectable) || this.parent == null) { + if (!GetStyle(ControlStyles.Selectable)) { return false; } - parent = this.parent; + parent = this; while (parent != null) { if (!parent.is_visible || !parent.is_enabled) { return false; @@ -1488,6 +1564,16 @@ namespace System.Windows.Forms } } + internal virtual bool InternalCapture { + get { + return Capture; + } + + set { + Capture = value; + } + } + [EditorBrowsable(EditorBrowsableState.Advanced)] [Browsable(false)] [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] @@ -1510,6 +1596,7 @@ namespace System.Windows.Forms } [DefaultValue(true)] + [MWFCategory("Focus")] public bool CausesValidation { get { return this.causes_validation; @@ -1582,6 +1669,7 @@ namespace System.Windows.Forms } [DefaultValue(null)] + [MWFCategory("Behavior")] public virtual ContextMenu ContextMenu { get { return context_menu; @@ -1608,14 +1696,12 @@ namespace System.Windows.Forms [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public bool Created { get { - if (!this.is_disposed && (this.window.Handle != IntPtr.Zero)) { - return true; - } - return false; + return (!is_disposed && is_created); } } [AmbientValue(null)] + [MWFCategory("Appearance")] public virtual Cursor Cursor { get { if (cursor != null) { @@ -1635,17 +1721,19 @@ namespace System.Windows.Forms cursor = value; - pt = Cursor.Position; - //Console.WriteLine ("{0} {1} {2}", bounds, pt, bounds.Contains (pt)); - if (bounds.Contains(pt)) { - if (GetChildAtPoint(pt) == null) { - if (cursor != null) { - XplatUI.SetCursor(window.Handle, cursor.handle); - } else { - if (parent != null) { - XplatUI.SetCursor(window.Handle, parent.Cursor.handle); + if (IsHandleCreated) { + pt = Cursor.Position; + + if (bounds.Contains(pt)) { + if (GetChildAtPoint(pt) == null) { + if (cursor != null) { + XplatUI.SetCursor(window.Handle, cursor.handle); } else { - XplatUI.SetCursor(window.Handle, Cursors.def.handle); + if (parent != null) { + XplatUI.SetCursor(window.Handle, parent.Cursor.handle); + } else { + XplatUI.SetCursor(window.Handle, Cursors.def.handle); + } } } } @@ -1660,6 +1748,7 @@ namespace System.Windows.Forms [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)] [ParenthesizePropertyName(true)] [RefreshProperties(RefreshProperties.All)] + [MWFCategory("Data")] public ControlBindingsCollection DataBindings { get { if (data_bindings == null) @@ -1689,6 +1778,7 @@ namespace System.Windows.Forms [Localizable(true)] [RefreshProperties(RefreshProperties.Repaint)] [DefaultValue(DockStyle.None)] + [MWFCategory("Layout")] public virtual DockStyle Dock { get { return dock_style; @@ -1711,6 +1801,7 @@ namespace System.Windows.Forms [DispId(-514)] [Localizable(true)] + [MWFCategory("Behavior")] public bool Enabled { get { if (!is_enabled) { @@ -1729,6 +1820,15 @@ namespace System.Windows.Forms return; } + if (IsHandleCreated) { + if (this is Form) { + if (((Form)this).context == null) { + XplatUI.EnableWindow(window.Handle, value); + } + } else { + XplatUI.EnableWindow(window.Handle, value); + } + } is_enabled = value; Refresh(); OnEnabledChanged (EventArgs.Empty); @@ -1747,6 +1847,7 @@ namespace System.Windows.Forms [DispId(-512)] [AmbientValue(null)] [Localizable(true)] + [MWFCategory("Appearance")] public virtual Font Font { get { if (font != null) { @@ -1760,6 +1861,7 @@ namespace System.Windows.Forms return DefaultFont; } + [param:MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Font))] set { if (font != null && font.Equals (value)) { return; @@ -1772,6 +1874,7 @@ namespace System.Windows.Forms } [DispId(-513)] + [MWFCategory("Appearance")] public virtual Color ForeColor { get { if (foreground_color.IsEmpty) { @@ -1797,6 +1900,13 @@ namespace System.Windows.Forms [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public IntPtr Handle { // IWin32Window get { +#if NET_2_0 + if (verify_thread_handle) { + if (this.InvokeRequired) { + throw new InvalidOperationException("Cross-thread access of handle detected. Handle access only valid on thread that created the control"); + } + } +#endif if (!IsHandleCreated) { CreateHandle(); } @@ -1831,6 +1941,7 @@ namespace System.Windows.Forms [AmbientValue(ImeMode.Inherit)] [Localizable(true)] + [MWFCategory("Behavior")] public ImeMode ImeMode { get { if (ime_mode == DefaultImeMode) { @@ -1856,7 +1967,7 @@ namespace System.Windows.Forms [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public bool InvokeRequired { // ISynchronizeInvoke get { - if (creator_thread!=Thread.CurrentThread) { + if (creator_thread != null && creator_thread!=Thread.CurrentThread) { return true; } return false; @@ -1890,7 +2001,7 @@ namespace System.Windows.Forms [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public bool IsHandleCreated { get { - if ((window!=null) && (window.Handle!=IntPtr.Zero)) { + if ((window != null) && (window.Handle != IntPtr.Zero)) { return true; } @@ -1912,6 +2023,7 @@ namespace System.Windows.Forms } [Localizable(true)] + [MWFCategory("Layout")] public Point Location { get { return new Point(bounds.X, bounds.Y); @@ -1925,14 +2037,27 @@ namespace System.Windows.Forms [Browsable(false)] public string Name { get { - return this.name; + return name; } set { - this.name=value; + name = value; } } +#if NET_2_0 + [Localizable(true)] + public Padding Padding { + get { + return padding; + } + + set { + padding = value; + } + } +#endif + [Browsable(false)] [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public Control Parent { @@ -2028,6 +2153,7 @@ namespace System.Windows.Forms [AmbientValue(RightToLeft.Inherit)] [Localizable(true)] + [MWFCategory("Appearance")] public virtual RightToLeft RightToLeft { get { if (right_to_left == RightToLeft.Inherit) { @@ -2055,10 +2181,19 @@ namespace System.Windows.Forms set { base.Site = value; + + AmbientProperties ap = (AmbientProperties) value.GetService (typeof (AmbientProperties)); + if (ap != null) { + BackColor = ap.BackColor; + ForeColor = ap.ForeColor; + Cursor = ap.Cursor; + Font = ap.Font; + } } } [Localizable(true)] + [MWFCategory("Layout")] public Size Size { get { return new Size(Width, Height); @@ -2071,6 +2206,7 @@ namespace System.Windows.Forms [Localizable(true)] [MergableProperty(false)] + [MWFCategory("Behavior")] public int TabIndex { get { if (tab_index != -1) { @@ -2089,6 +2225,7 @@ namespace System.Windows.Forms [DispId(-516)] [DefaultValue(true)] + [MWFCategory("Behavior")] public bool TabStop { get { return tab_stop; @@ -2106,6 +2243,7 @@ namespace System.Windows.Forms [Bindable(true)] [TypeConverter(typeof(StringConverter))] [DefaultValue(null)] + [MWFCategory("Data")] public object Tag { get { return control_tag; @@ -2119,6 +2257,7 @@ namespace System.Windows.Forms [DispId(-517)] [Localizable(true)] [BindableAttribute(true)] + [MWFCategory("Appearance")] public virtual string Text { get { // Our implementation ignores ControlStyles.CacheText - we always cache @@ -2169,6 +2308,7 @@ namespace System.Windows.Forms } [Localizable(true)] + [MWFCategory("Behavior")] public bool Visible { get { if (!is_visible) { @@ -2259,10 +2399,10 @@ namespace System.Windows.Forms create_params.Param = 0; if (allow_drop) { - create_params.ExStyle |= (int)WindowStyles.WS_EX_ACCEPTFILES; + create_params.ExStyle |= (int)WindowExStyles.WS_EX_ACCEPTFILES; } - if (parent!=null) { + if ((parent!=null) && (parent.IsHandleCreated)) { create_params.Parent = parent.Handle; } @@ -2272,12 +2412,16 @@ namespace System.Windows.Forms create_params.Style |= (int)WindowStyles.WS_VISIBLE; } + if (!is_enabled) { + create_params.Style |= (int)WindowStyles.WS_DISABLED; + } + switch (border_style) { case BorderStyle.FixedSingle: create_params.Style |= (int) WindowStyles.WS_BORDER; break; case BorderStyle.Fixed3D: - create_params.ExStyle |= (int) WindowStyles.WS_EX_CLIENTEDGE; + create_params.ExStyle |= (int) WindowExStyles.WS_EX_CLIENTEDGE; break; } @@ -2293,7 +2437,7 @@ namespace System.Windows.Forms protected virtual Size DefaultSize { get { - return new Size(100, 23); + return new Size(0, 0); } } @@ -2412,7 +2556,10 @@ namespace System.Windows.Forms #region Public Instance Methods [EditorBrowsable(EditorBrowsableState.Advanced)] public IAsyncResult BeginInvoke(Delegate method) { - return BeginInvokeInternal(method, null, false); + object [] prms = null; + if (method is EventHandler) + prms = new object [] { this, EventArgs.Empty }; + return BeginInvokeInternal(method, prms, false); } [EditorBrowsable(EditorBrowsableState.Advanced)] @@ -2425,10 +2572,19 @@ namespace System.Windows.Forms if (parent.child_controls.Contains(this)) { parent.child_controls.SetChildIndex(this, 0); } + } else if (parent != null) { + if (parent.child_controls.impl_list != null) { + Control last_impl = (Control) parent.child_controls.impl_list [parent.child_controls.impl_list.Count - 1]; + if (IsHandleCreated) { + XplatUI.SetZOrder (this.window.Handle, last_impl.Handle, false, false); + } + } else { + if (IsHandleCreated) { + XplatUI.SetZOrder(this.window.Handle, IntPtr.Zero, true, false); + } + } } - XplatUI.SetZOrder(this.window.Handle, IntPtr.Zero, true, false); - if (parent != null) { parent.Refresh(); } @@ -2502,11 +2658,10 @@ namespace System.Windows.Forms } public bool Focus() { - if (IsHandleCreated && !has_focus) { - has_focus = true; + if (CanFocus && IsHandleCreated && !has_focus) { XplatUI.SetFocus(window.Handle); } - return true; + return has_focus; } public Control GetChildAtPoint(Point pt) { @@ -2651,12 +2806,17 @@ namespace System.Windows.Forms AnchorStyles anchor; Rectangle space; - space=this.DisplayRectangle; + space= DisplayRectangle; // Deal with docking; go through in reverse, MS docs say that lowest Z-order is closest to edge Control [] controls = child_controls.GetAllControls (); for (int i = controls.Length - 1; i >= 0; i--) { child = controls [i]; + + if (!child.Visible) { + continue; + } + switch (child.Dock) { case DockStyle.None: { // Do nothing @@ -2694,14 +2854,14 @@ namespace System.Windows.Forms for (int i = controls.Length - 1; i >= 0; i--) { child=controls[i]; - if (child.Dock == DockStyle.Fill) { + if (child.Visible && (child.Dock == DockStyle.Fill)) { child.SetBounds(space.Left, space.Top, space.Width, space.Height); space.Width=0; space.Height=0; } } - space=this.DisplayRectangle; + space=DisplayRectangle; for (int i=0; i < controls.Length; i++) { int left; @@ -2710,6 +2870,12 @@ namespace System.Windows.Forms int height; child = controls[i]; + + // If the control is docked we don't need to do anything + if (child.Dock != DockStyle.None) { + continue; + } + anchor = child.Anchor; left = child.Left; @@ -2717,37 +2883,32 @@ namespace System.Windows.Forms width = child.Width; height = child.Height; - // If the control is docked we don't need to do anything - if (child.Dock != DockStyle.None) { - continue; - } - if ((anchor & AnchorStyles.Left) !=0 ) { if ((anchor & AnchorStyles.Right) != 0) { - width = client_size.Width - child.dist_right - left; + width = space.Width - child.dist_right - left; } else { ; // Left anchored only, nothing to be done } } else if ((anchor & AnchorStyles.Right) != 0) { - left = client_size.Width - child.dist_right - width; + left = space.Width - child.dist_right - width; } else { // left+=diff_width/2 will introduce rounding errors (diff_width removed from svn after r51780) // This calculates from scratch every time: - left = child.dist_left + (client_size.Width - (child.dist_left + width + child.dist_right)) / 2; + left = child.dist_left + (space.Width - (child.dist_left + width + child.dist_right)) / 2; } if ((anchor & AnchorStyles.Top) !=0 ) { if ((anchor & AnchorStyles.Bottom) != 0) { - height = client_size.Height - child.dist_bottom - top; + height = space.Height - child.dist_bottom - top; } else { ; // Top anchored only, nothing to be done } } else if ((anchor & AnchorStyles.Bottom) != 0) { - top = client_size.Height - child.dist_bottom - height; + top = space.Height - child.dist_bottom - height; } else { // top += diff_height/2 will introduce rounding errors (diff_height removed from after r51780) // This calculates from scratch every time: - top = child.dist_top + (client_size.Height - (child.dist_top + height + child.dist_bottom)) / 2; + top = child.dist_top + (space.Height - (child.dist_top + height + child.dist_bottom)) / 2; } // Sanity @@ -2807,11 +2968,11 @@ namespace System.Windows.Forms return true; } else if (msg.Msg == (int)Msg.WM_CHAR) { if (IsInputChar((char)msg.WParam)) { - return true; + return false; } } else if (msg.Msg == (int)Msg.WM_SYSCHAR) { if (IsInputChar((char)msg.WParam)) { - return true; + return false; } return ProcessDialogChar((char)msg.WParam); } @@ -2828,7 +2989,6 @@ namespace System.Windows.Forms public virtual void Refresh() { if (IsHandleCreated == true) { - Invalidate(); XplatUI.UpdateWindow(window.Handle); @@ -2846,9 +3006,8 @@ namespace System.Windows.Forms } [EditorBrowsable(EditorBrowsableState.Never)] - [MonoTODO] public void ResetBindings() { - // Do something + data_bindings.Clear(); } [EditorBrowsable(EditorBrowsableState.Never)] @@ -2885,19 +3044,19 @@ namespace System.Windows.Forms } public void ResumeLayout(bool performLayout) { - layout_suspended--; - if (layout_suspended > 0) { - return; + layout_suspended--; } - Control [] controls = child_controls.GetAllControls (); - for (int i=0; i 1) { mouse_clicks = 1; } @@ -3676,6 +3852,7 @@ namespace System.Windows.Forms if (CanSelect && !is_selected) { Select(this); } + InternalCapture = true; OnMouseDown (new MouseEventArgs (FromParamToMouseButtons ((int) m.WParam.ToInt32()), mouse_clicks, LowOrder ((int) m.LParam.ToInt32 ()), HighOrder ((int) m.LParam.ToInt32 ()), 0)); @@ -3684,6 +3861,7 @@ namespace System.Windows.Forms } case Msg.WM_LBUTTONDBLCLK: { + InternalCapture = true; mouse_clicks++; OnMouseDown (new MouseEventArgs (FromParamToMouseButtons ((int) m.WParam.ToInt32()), mouse_clicks, LowOrder ((int) m.LParam.ToInt32 ()), HighOrder ((int) m.LParam.ToInt32 ()), @@ -3693,11 +3871,18 @@ namespace System.Windows.Forms } case Msg.WM_MBUTTONUP: { - HandleClick(mouse_clicks); - OnMouseUp (new MouseEventArgs (FromParamToMouseButtons ((int) m.WParam.ToInt32()) | MouseButtons.Middle, + MouseEventArgs me; + + me = new MouseEventArgs (FromParamToMouseButtons ((int) m.WParam.ToInt32()) | MouseButtons.Middle, mouse_clicks, LowOrder ((int) m.LParam.ToInt32 ()), HighOrder ((int) m.LParam.ToInt32 ()), - 0)); + 0); + + HandleClick(mouse_clicks, me); + OnMouseUp (me); + if (InternalCapture) { + InternalCapture = false; + } if (mouse_clicks > 1) { mouse_clicks = 1; } @@ -3705,6 +3890,7 @@ namespace System.Windows.Forms } case Msg.WM_MBUTTONDOWN: { + InternalCapture = true; OnMouseDown (new MouseEventArgs (FromParamToMouseButtons ((int) m.WParam.ToInt32()), mouse_clicks, LowOrder ((int) m.LParam.ToInt32 ()), HighOrder ((int) m.LParam.ToInt32 ()), 0)); @@ -3713,6 +3899,7 @@ namespace System.Windows.Forms } case Msg.WM_MBUTTONDBLCLK: { + InternalCapture = true; mouse_clicks++; OnMouseDown (new MouseEventArgs (FromParamToMouseButtons ((int) m.WParam.ToInt32()), mouse_clicks, LowOrder ((int) m.LParam.ToInt32 ()), HighOrder ((int) m.LParam.ToInt32 ()), @@ -3721,15 +3908,26 @@ namespace System.Windows.Forms } case Msg.WM_RBUTTONUP: { - if (context_menu != null) { - context_menu.Show(this, new Point(LowOrder ((int) m.LParam.ToInt32 ()), HighOrder ((int) m.LParam.ToInt32 ()))); - } + MouseEventArgs me; + Point pt; + + pt = new Point(LowOrder ((int) m.LParam.ToInt32 ()), HighOrder ((int) m.LParam.ToInt32 ())); + pt = PointToScreen(pt); + + XplatUI.SendMessage(m.HWnd, Msg.WM_CONTEXTMENU, m.HWnd, (IntPtr)(pt.X + (pt.Y << 16))); - HandleClick(mouse_clicks); - OnMouseUp (new MouseEventArgs (FromParamToMouseButtons ((int) m.WParam.ToInt32()) | MouseButtons.Right, + me = new MouseEventArgs (FromParamToMouseButtons ((int) m.WParam.ToInt32()) | MouseButtons.Right, mouse_clicks, LowOrder ((int) m.LParam.ToInt32 ()), HighOrder ((int) m.LParam.ToInt32 ()), - 0)); + 0); + + HandleClick(mouse_clicks, me); + OnMouseUp (me); + + if (InternalCapture) { + InternalCapture = false; + } + if (mouse_clicks > 1) { mouse_clicks = 1; } @@ -3737,6 +3935,7 @@ namespace System.Windows.Forms } case Msg.WM_RBUTTONDOWN: { + InternalCapture = true; OnMouseDown (new MouseEventArgs (FromParamToMouseButtons ((int) m.WParam.ToInt32()), mouse_clicks, LowOrder ((int) m.LParam.ToInt32 ()), HighOrder ((int) m.LParam.ToInt32 ()), 0)); @@ -3744,6 +3943,7 @@ namespace System.Windows.Forms } case Msg.WM_RBUTTONDBLCLK: { + InternalCapture = true; mouse_clicks++; OnMouseDown (new MouseEventArgs (FromParamToMouseButtons ((int) m.WParam.ToInt32()), mouse_clicks, LowOrder ((int) m.LParam.ToInt32 ()), HighOrder ((int) m.LParam.ToInt32 ()), @@ -3751,6 +3951,19 @@ namespace System.Windows.Forms return; } + case Msg.WM_CONTEXTMENU: { + if (context_menu != null) { + Point pt; + + pt = new Point(LowOrder ((int) m.LParam.ToInt32 ()), HighOrder ((int) m.LParam.ToInt32 ())); + context_menu.Show(this, PointToClient(pt)); + return; + } + + DefWndProc(ref m); + return; + } + case Msg.WM_MOUSEWHEEL: { OnMouseWheel (new MouseEventArgs (FromParamToMouseButtons ((int) m.WParam.ToInt32()), @@ -3788,25 +4001,13 @@ namespace System.Windows.Forms return; } - case Msg.WM_SYSKEYDOWN: - case Msg.WM_KEYDOWN: - case Msg.WM_SYSKEYUP: - case Msg.WM_KEYUP: - case Msg.WM_SYSCHAR: - case Msg.WM_CHAR: { - if (PreProcessMessage(ref m)) { - return; - } - + case Msg.WM_SYSKEYUP: { if (ProcessKeyMessage(ref m)) { + m.Result = IntPtr.Zero; return; } - if (ProcessKeyEventArgs(ref m)) { - return; - } - - if ((m.Msg == (int)Msg.WM_SYSKEYUP) && ((m.WParam.ToInt32() & (int)Keys.KeyCode) == (int)Keys.Menu)) { + if ((m.WParam.ToInt32() & (int)Keys.KeyCode) == (int)Keys.Menu) { Form form; form = FindForm(); @@ -3819,6 +4020,19 @@ namespace System.Windows.Forms return; } + case Msg.WM_SYSKEYDOWN: + case Msg.WM_KEYDOWN: + case Msg.WM_KEYUP: + case Msg.WM_SYSCHAR: + case Msg.WM_CHAR: { + if (ProcessKeyMessage(ref m)) { + m.Result = IntPtr.Zero; + return; + } + DefWndProc (ref m); + return; + } + case Msg.WM_HELP: { Point mouse_pos; if (m.LParam != IntPtr.Zero) { @@ -3874,7 +4088,7 @@ namespace System.Windows.Forms case Msg.WM_SETCURSOR: { - if (cursor == null) { + if ((cursor == null) || ((HitTest)(m.LParam.ToInt32() & 0xffff) != HitTest.HTCLIENT)) { DefWndProc(ref m); return; } @@ -4129,6 +4343,10 @@ namespace System.Windows.Forms if (Paint!=null) Paint(this, e); } + internal virtual void OnPaintBackgroundInternal(PaintEventArgs e) { + // Override me + } + internal virtual void OnPaintInternal(PaintEventArgs e) { // Override me } @@ -4275,30 +4493,22 @@ namespace System.Windows.Forms [EditorBrowsable(EditorBrowsableState.Advanced)] protected virtual void OnVisibleChanged(EventArgs e) { - if (!is_visible) { - if (dc_mem!=null) { - dc_mem.Dispose (); - dc_mem=null; - } - - if (bmp_mem!=null) { - bmp_mem.Dispose(); - bmp_mem=null; - } - } else { + if ((parent != null) && !Created && Visible) { if (!is_disposed) { - if (!this.IsHandleCreated) { - this.CreateControl(); - } + CreateControl(); PerformLayout(); } } + + needs_redraw = true; if (VisibleChanged!=null) VisibleChanged(this, e); // We need to tell our kids for (int i=0; i