also, disable the call do BindColumns in
[mono.git] / mcs / class / Managed.Windows.Forms / System.Windows.Forms / NotifyIcon.cs
index ba52b290dda9bb3194588c166552c94beb2fc258..7e0f7abd78da649ca3392dff82d56ca4a297e6bd 100644 (file)
@@ -33,10 +33,14 @@ using System.Drawing;
 
 namespace System.Windows.Forms {
        [DefaultProperty("Text")]
+#if NET_2_0
+       [DefaultEvent("MouseDoubleClick")]
+#else
        [DefaultEvent("MouseDown")]
+#endif
        [Designer ("System.Windows.Forms.Design.NotifyIconDesigner, " + Consts.AssemblySystem_Design, "System.ComponentModel.Design.IDesigner")]
        [ToolboxItemFilter("System.Windows.Forms", ToolboxItemFilterType.Allow)]
-       public sealed class NotifyIcon : System.ComponentModel.Component {
+       public sealed class NotifyIcon : Component {
                #region Local Variables
                private ContextMenu             context_menu;
                private Icon                    icon;
@@ -58,7 +62,9 @@ namespace System.Windows.Forms {
                                is_visible = false;
                                rect = new Rectangle(0, 0, 1, 1);
 
-                               CreateControl();
+                               FormBorderStyle = FormBorderStyle.None;
+
+                               //CreateControl();
 
                                SizeChanged += new EventHandler(HandleSizeChanged);
 
@@ -99,39 +105,39 @@ namespace System.Windows.Forms {
                                        case Msg.WM_USER: {
                                                switch ((Msg)m.LParam.ToInt32()) {
                                                        case Msg.WM_LBUTTONDOWN: {
-                                                               HandleMouseDown(this, new MouseEventArgs(MouseButtons.Left, 1, Control.MousePosition.X, Control.MousePosition.Y, 0));
+                                                               owner.OnMouseDown (new MouseEventArgs(MouseButtons.Left, 1, Control.MousePosition.X, Control.MousePosition.Y, 0));
                                                                return;
                                                        }
 
                                                        case Msg.WM_LBUTTONUP: {
-                                                               HandleMouseUp(this, new MouseEventArgs(MouseButtons.Left, 1, Control.MousePosition.X, Control.MousePosition.Y, 0));
-                                                               HandleClick(this, EventArgs.Empty);
+                                                               owner.OnMouseUp (new MouseEventArgs(MouseButtons.Left, 1, Control.MousePosition.X, Control.MousePosition.Y, 0));
+                                                               owner.OnClick (EventArgs.Empty);
                                                                return;
                                                        }
 
                                                        case Msg.WM_LBUTTONDBLCLK: {
-                                                               HandleDoubleClick(this, EventArgs.Empty);
+                                                               owner.OnDoubleClick (EventArgs.Empty);
                                                                return;
                                                        }
 
                                                        case Msg.WM_MOUSEMOVE: {
-                                                               HandleMouseMove(this, new MouseEventArgs(MouseButtons.None, 1, Control.MousePosition.X, Control.MousePosition.Y, 0));
+                                                               owner.OnMouseMove (new MouseEventArgs(MouseButtons.None, 1, Control.MousePosition.X, Control.MousePosition.Y, 0));
                                                                return;
                                                        }
 
                                                        case Msg.WM_RBUTTONDOWN: {
-                                                               HandleMouseDown(this, new MouseEventArgs(MouseButtons.Right, 1, Control.MousePosition.X, Control.MousePosition.Y, 0));
+                                                               owner.OnMouseDown (new MouseEventArgs(MouseButtons.Right, 1, Control.MousePosition.X, Control.MousePosition.Y, 0));
                                                                return;
                                                        }
 
                                                        case Msg.WM_RBUTTONUP: {
-                                                               HandleMouseUp(this, new MouseEventArgs(MouseButtons.Right, 1, Control.MousePosition.X, Control.MousePosition.Y, 0));
-                                                               HandleClick(this, EventArgs.Empty);
+                                                               owner.OnMouseUp (new MouseEventArgs(MouseButtons.Right, 1, Control.MousePosition.X, Control.MousePosition.Y, 0));
+                                                               owner.OnClick (EventArgs.Empty);
                                                                return;
                                                        }
 
                                                        case Msg.WM_RBUTTONDBLCLK: {
-                                                               HandleDoubleClick(this, EventArgs.Empty);
+                                                               owner.OnDoubleClick (EventArgs.Empty);
                                                                return;
                                                        }
                                                }
@@ -142,30 +148,21 @@ namespace System.Windows.Forms {
                        }
 
                        internal void CalculateIconRect() {
-                               if (owner != null && owner.icon != null) {
-                                       int             x;
-                                       int             y;
-                                       int             size;
-
-                                       // Icons are always square. Try to center them in the window
-                                       if (ClientRectangle.Width < ClientRectangle.Height) {
-                                               size = ClientRectangle.Width;
-                                       } else {
-                                               size = ClientRectangle.Height;
-                                       }
-                                       x = this.ClientRectangle.Width / 2 - size / 2;
-                                       y = this.ClientRectangle.Height / 2 - size / 2;
-                                       rect = new Rectangle(x, y, size, size);
-
-                                       // Force our window to be square
-                                       if (Width != size) {
-                                               this.Width = size;
-                                       }
-
-                                       if (Height != size) {
-                                               this.Height = size;
-                                       }
+                               int             x;
+                               int             y;
+                               int             size;
+
+                               // Icons are always square. Try to center them in the window
+                               if (ClientRectangle.Width < ClientRectangle.Height) {
+                                       size = ClientRectangle.Width;
+                               } else {
+                                       size = ClientRectangle.Height;
                                }
+                               x = this.ClientRectangle.Width / 2 - size / 2;
+                               y = this.ClientRectangle.Height / 2 - size / 2;
+                               rect = new Rectangle(x, y, size, size);
+
+                               Bounds = new Rectangle (0, 0, size, size);
                        }
 
                        internal override void OnPaintInternal (PaintEventArgs e) {
@@ -185,41 +182,32 @@ namespace System.Windows.Forms {
 
 
                        private void HandleSizeChanged(object sender, EventArgs e) {
-                               CalculateIconRect();
+                               owner.Recalculate ();
                        }
 
-                       private void HandleClick(object sender, EventArgs e) {
-                               if (owner.Click != null) {
-                                       owner.Click(owner, e);
-                               }
+                       private void HandleClick (object sender, EventArgs e)
+                       {
+                               owner.OnClick (e);
                        }
 
-                       private void HandleDoubleClick(object sender, EventArgs e) {
-                               if (owner.DoubleClick != null) {
-                                       owner.DoubleClick(owner, e);
-                               }
+                       private void HandleDoubleClick (object sender, EventArgs e)
+                       {
+                               owner.OnDoubleClick (e);
                        }
 
-                       private void HandleMouseDown(object sender, MouseEventArgs e) {
-                               if (owner.MouseDown != null) {
-                                       owner.MouseDown(owner, e);
-                               }
+                       private void HandleMouseDown (object sender, MouseEventArgs e)
+                       {
+                               owner.OnMouseDown (e);
                        }
 
-                       private void HandleMouseUp(object sender, MouseEventArgs e) {
-                               if ((e.Button & MouseButtons.Right) == MouseButtons.Right && owner.context_menu != null) {
-                                       owner.context_menu.Show(this, new Point(e.X, e.Y));
-                               }
-
-                               if (owner.MouseUp != null) {
-                                       owner.MouseUp(owner, e);
-                               }
+                       private void HandleMouseUp (object sender, MouseEventArgs e)
+                       {
+                               owner.OnMouseUp (e);
                        }
 
-                       private void HandleMouseMove(object sender, MouseEventArgs e) {
-                               if (owner.MouseMove != null) {
-                                       owner.MouseMove(owner, e);
-                               }
+                       private void HandleMouseMove (object sender, MouseEventArgs e)
+                       {
+                               owner.OnMouseMove (e);
                        }
                }
                #endregion      // NotifyIconWindow Class
@@ -235,29 +223,66 @@ namespace System.Windows.Forms {
                #endregion      // Public Constructors
 
                #region Private Methods
-               private void ShowSystray(bool property_changed) {
-                       if (property_changed) {
-                               window.CalculateIconRect();
-                       }
+               private void OnClick (EventArgs e)
+               {
+                       EventHandler eh = (EventHandler)(Events [ClickEvent]);
+                       if (eh != null)
+                               eh (this, e);
+               }
 
-                       if (systray_active) {
-                               if (property_changed) {
-                                       UpdateSystray();
-                               }
-                               return;
-                       }
+               private void OnDoubleClick (EventArgs e)
+               {
+                       EventHandler eh = (EventHandler)(Events [DoubleClickEvent]);
+                       if (eh != null)
+                               eh (this, e);
+               }
+
+               private void OnMouseDown (MouseEventArgs e)
+               {
+                       MouseEventHandler eh = (MouseEventHandler)(Events [MouseDownEvent]);
+                       if (eh != null)
+                               eh (this, e);
+               }
+
+               private void OnMouseUp (MouseEventArgs e)
+               {
+                       if ((e.Button & MouseButtons.Right) == MouseButtons.Right && context_menu != null)
+                               context_menu.Show (window, new Point(e.X, e.Y));
 
-                       if (icon == null) {
+                       MouseEventHandler eh = (MouseEventHandler)(Events [MouseUpEvent]);
+                       if (eh != null)
+                               eh (this, e);
+               }
+
+               private void OnMouseMove (MouseEventArgs e)
+               {
+                       MouseEventHandler eh = (MouseEventHandler)(Events [MouseMoveEvent]);
+                       if (eh != null)
+                               eh (this, e);
+               }
+
+               private void Recalculate () 
+               {
+                       window.CalculateIconRect ();
+
+                       if (systray_active)
+                               UpdateSystray ();
+               }
+
+               private void ShowSystray()
+               {
+                       systray_active = true;
+
+                       if (icon == null)
                                return;
-                       }
 
                        icon_bitmap = icon.ToBitmap();
 
-                       systray_active = true;
                        XplatUI.SystrayAdd(window.Handle, text, icon, out tooltip);
                }
 
-               private void HideSystray() {
+               private void HideSystray()
+               {
                        if (!systray_active) {
                                return;
                        }
@@ -266,7 +291,8 @@ namespace System.Windows.Forms {
                        XplatUI.SystrayRemove(window.Handle, ref tooltip);
                }
 
-               private void UpdateSystray() {
+               private void UpdateSystray()
+               {
                        if (icon_bitmap != null) {
                                icon_bitmap.Dispose();
                        }
@@ -282,6 +308,9 @@ namespace System.Windows.Forms {
 
                #region Public Instance Properties
                [DefaultValue(null)]
+#if NET_2_0
+               [Browsable (false)]
+#endif
                public ContextMenu ContextMenu {
                        get {
                                return context_menu;
@@ -305,12 +334,22 @@ namespace System.Windows.Forms {
                        set {
                                if (icon != value) {
                                        icon = value;
-                                       ShowSystray(true);
+                                       if (text == string.Empty && icon == null) {
+                                               HideSystray ();
+                                       }
+                                       else {
+                                               Recalculate ();
+                                       }
                                }
                        }
                }
 
-               [Localizable(true)]
+#if NET_2_0
+               [DefaultValue ("")]
+               [Editor ("System.ComponentModel.Design.MultilineStringEditor, " + Consts.AssemblySystem_Design,
+                        typeof (System.Drawing.Design.UITypeEditor))]
+#endif
+               [Localizable (true)]
                public string Text {
                        get {
                                return text;
@@ -325,7 +364,7 @@ namespace System.Windows.Forms {
                                        if (text == string.Empty && icon == null) {
                                                HideSystray();
                                        } else {
-                                               ShowSystray(true);
+                                               Recalculate ();
                                        }
                                }
                        }
@@ -346,7 +385,7 @@ namespace System.Windows.Forms {
                                        window.is_visible = value;
 
                                        if (visible) {
-                                               ShowSystray(false);
+                                               ShowSystray ();
                                        } else {
                                                HideSystray();
                                        }
@@ -370,15 +409,47 @@ namespace System.Windows.Forms {
                #endregion      // Protected Instance Methods
 
                #region Events
+               static object ClickEvent = new object ();
+               static object DoubleClickEvent = new object ();
+               static object MouseDownEvent = new object ();
+               static object MouseMoveEvent = new object ();
+               static object MouseUpEvent = new object ();
+
+#if NET_2_0
+               [MWFCategory("Action")]
+#else
                [Category("Action")]
-               public event EventHandler       Click;
+#endif
+               public event EventHandler Click {
+                       add { Events.AddHandler (ClickEvent, value); }
+                       remove { Events.RemoveHandler (ClickEvent, value); }
+               }
 
+#if NET_2_0
+               [MWFCategory("Action")]
+#else
                [Category("Action")]
-               public event EventHandler       DoubleClick;
+#endif
+               public event EventHandler DoubleClick {
+                       add { Events.AddHandler (DoubleClickEvent, value); }
+                       remove { Events.RemoveHandler (DoubleClickEvent, value); }
+               }
+
+               public event MouseEventHandler MouseDown {
+                       add { Events.AddHandler (MouseDownEvent, value); }
+                       remove { Events.RemoveHandler (MouseDownEvent, value); }
+               }
+
+               public event MouseEventHandler MouseMove {
+                       add { Events.AddHandler (MouseMoveEvent, value); }
+                       remove { Events.RemoveHandler (MouseMoveEvent, value); }
+               }
+
+               public event MouseEventHandler MouseUp {
+                       add { Events.AddHandler (MouseUpEvent, value); }
+                       remove { Events.RemoveHandler (MouseUpEvent, value); }
+               }
 
-               public event MouseEventHandler  MouseDown;
-               public event MouseEventHandler  MouseMove;
-               public event MouseEventHandler  MouseUp;
                #endregion      // Events
        }
 }