Author: everaldo
Date: 2007-03-29 07:15:47 -0500 (Thu, 29 Mar 2007)
New Revision: 75131
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/XplatUIX11-new.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/NotifyIcon.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Theme.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
Log:
In System.Windows.Forms:
2007-03-28 Everaldo Canuto <[EMAIL PROTECTED]>
[Fixes #79149]
* XplatUIX11.cs: Implement SystrayBalloon for X11 systems.
* ThemeWin32Classic.cs, Theme.cs: DrawBalloonWindow and
BalloonWindowRect
implemented, this methods is used by NotifyIcon.BalloonWindow class.
* NotifyIcon.cs: BalloonWindow class added to support Balloon in X11
systems.
In System.Windows.Forms.X11Internal:
2007-03-29 Everaldo Canuto <[EMAIL PROTECTED]>
* XplatUIX11-new.cs: Implement SystrayBalloon for X11 systems.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-03-29 12:04:40 UTC (rev 75130)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-03-29 12:15:47 UTC (rev 75131)
@@ -1,3 +1,15 @@
+2007-03-28 Everaldo Canuto <[EMAIL PROTECTED]>
+
+ [Fixes #79149]
+
+ * XplatUIX11.cs: Implement SystrayBalloon for X11 systems.
+
+ * ThemeWin32Classic.cs, Theme.cs: DrawBalloonWindow and
BalloonWindowRect
+ implemented, this methods is used by NotifyIcon.BalloonWindow class.
+
+ * NotifyIcon.cs: BalloonWindow class added to support Balloon in X11
+ systems.
+
2007-03-28 Carlos Alberto Cortez <[EMAIL PROTECTED]>
* ListViewItem.cs: Forgot to make Invalidate internal.
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/NotifyIcon.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/NotifyIcon.cs
2007-03-29 12:04:40 UTC (rev 75130)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/NotifyIcon.cs
2007-03-29 12:15:47 UTC (rev 75131)
@@ -28,6 +28,7 @@
using System.ComponentModel;
using System.ComponentModel.Design;
using System.Drawing;
+using System.Drawing.Text;
namespace System.Windows.Forms {
[DefaultProperty("Text")]
@@ -236,7 +237,123 @@
}
}
#endregion // NotifyIconWindow Class
+
+ #region NotifyIconBalloonWindow Class
+#if NET_2_0
+ internal class BalloonWindow : Form
+ {
+ private IntPtr owner;
+ private Timer timer;
+
+ private string title;
+ private string text;
+ private ToolTipIcon icon;
+ public BalloonWindow (IntPtr owner)
+ {
+ this.owner = owner;
+
+ StartPosition = FormStartPosition.Manual;
+ FormBorderStyle = FormBorderStyle.None;
+ TopMost = true;
+
+ MouseDown += new MouseEventHandler
(HandleMouseDown);
+
+ timer = new Timer ();
+ timer.Enabled = false;
+ timer.Tick += new EventHandler (HandleTimer);
+ }
+
+ protected override void OnShown (EventArgs e)
+ {
+ base.OnShown (e);
+ timer.Start ();
+ }
+
+ protected override void OnPaint (PaintEventArgs e)
+ {
+ ThemeEngine.Current.DrawBalloonWindow
(e.Graphics, ClientRectangle, this);
+ base.OnPaint (e);
+ }
+
+ private void Recalculate ()
+ {
+ Rectangle rect =
ThemeEngine.Current.BalloonWindowRect (this);
+
+ Left = rect.Left;
+ Top = rect.Top;
+ Width = rect.Width;
+ Height = rect.Height;
+ }
+
+ // To be used when we have a "close button" inside
balloon.
+ //private void HandleClick (object sender, EventArgs e)
+ //{
+ // XplatUI.SendMessage (owner, Msg.WM_USER,
IntPtr.Zero, (IntPtr) Msg.NIN_BALLOONHIDE);
+ // Close ();
+ //}
+
+ private void HandleMouseDown (object sender,
MouseEventArgs e)
+ {
+ XplatUI.SendMessage (owner, Msg.WM_USER,
IntPtr.Zero, (IntPtr) Msg.NIN_BALLOONUSERCLICK);
+ Close ();
+ }
+
+ private void HandleTimer (object sender, EventArgs e)
+ {
+ timer.Stop ();
+ XplatUI.SendMessage (owner, Msg.WM_USER,
IntPtr.Zero, (IntPtr) Msg.NIN_BALLOONTIMEOUT);
+ Close ();
+ }
+
+ internal StringFormat Format {
+ get {
+ StringFormat format = new StringFormat
();
+ format.Alignment = StringAlignment.Near;
+ format.HotkeyPrefix = HotkeyPrefix.Hide;
+
+ return format;
+ }
+ }
+
+ public string Title {
+ get { return this.title; }
+ set {
+ if (value == this.title)
+ return;
+
+ this.title = value;
+ Recalculate ();
+ }
+ }
+
+ public string Text {
+ get { return this.text; }
+ set {
+ if (value == this.text)
+ return;
+
+ this.text = value;
+ Recalculate ();
+ }
+ }
+
+ public int Timeout {
+ get { return timer.Interval; }
+ set {
+ // Some systems theres a limitiation in
timeout, WinXP is between 10k and 30k.
+ if (value < 10000)
+ timer.Interval = 10000;
+ else if (value > 30000)
+ timer.Interval = 30000;
+ else
+ timer.Interval = value;
+ }
+ }
+ }
+#endif
+ #endregion // NotifyIconBalloonWindow Class
+
#region Public Constructors
public NotifyIcon() {
window = new NotifyIconWindow(this);
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Theme.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Theme.cs
2007-03-29 12:04:40 UTC (rev 75130)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Theme.cs
2007-03-29 12:15:47 UTC (rev 75131)
@@ -912,6 +912,12 @@
public abstract Size ToolTipSize(ToolTip.ToolTipWindow tt,
string text);
#endregion // ToolTip
+ #region BalloonWindow
+#if NET_2_0
+ public abstract void DrawBalloonWindow (Graphics dc, Rectangle
clip, NotifyIcon.BalloonWindow control);
+ public abstract Rectangle BalloonWindowRect
(NotifyIcon.BalloonWindow control);
+#endif
+ #endregion // BalloonWindow
#region TrackBar
// Drawing
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs
2007-03-29 12:04:40 UTC (rev 75130)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs
2007-03-29 12:15:47 UTC (rev 75131)
@@ -4857,6 +4857,48 @@
}
#endregion // ToolTip
+ #region BalloonWindow
+#if NET_2_0
+ public override void DrawBalloonWindow (Graphics dc, Rectangle
clip, NotifyIcon.BalloonWindow control)
+ {
+ Brush solidbrush =
ResPool.GetSolidBrush(this.ColorInfoText);
+ Rectangle rect = control.ClientRectangle;
+
+ // Rectangle borders and background.
+ dc.FillRectangle (SystemBrushes.Info,
control.ClientRectangle);
+ dc.DrawRectangle (SystemPens.WindowFrame, 0, 0,
control.Width-1, control.Height-1);
+
+ // Title
+ Rectangle titlerect = new Rectangle (rect.X + 5, rect.Y
+ 5, rect.Width - 10, rect.Height - 10);
+ Font titlefont = new Font (control.Font.FontFamily,
control.Font.Size, control.Font.Style | FontStyle.Bold, control.Font.Unit);
+ dc.DrawString (control.Title, titlefont, solidbrush,
titlerect, control.Format);
+
+ // Text
+ Rectangle textrect = new Rectangle (rect.X + 5, rect.Y
+ 5, rect.Width - 10, rect.Height - 10);
+ StringFormat textformat = control.Format;
+ textformat.LineAlignment = StringAlignment.Far;
+ dc.DrawString (control.Text, control.Font, solidbrush,
textrect, textformat);
+ }
+
+ public override Rectangle BalloonWindowRect
(NotifyIcon.BalloonWindow control)
+ {
+ Rectangle deskrect = Screen.GetWorkingArea (control);
+ SizeF maxsize = new SizeF (250, 200);
+
+ SizeF titlesize = control.DeviceContext.MeasureString
(control.Title, control.Font, maxsize, control.Format);
+ SizeF textsize = control.DeviceContext.MeasureString
(control.Text, control.Font, maxsize, control.Format);
+
+ Rectangle rect = new Rectangle ();
+ rect.Height = (int) (titlesize.Height + textsize.Height
+ 15);
+ rect.Width = (int) ((titlesize.Width > textsize.Width)
? titlesize.Width : textsize.Width) + 10;
+ rect.X = deskrect.Width - rect.Width - 2;
+ rect.Y = deskrect.Height - rect.Height - 2;
+
+ return rect;
+ }
+#endif
+ #endregion // BalloonWindow
+
#region TrackBar
public override int TrackBarValueFromMousePosition (int x, int
y, TrackBar tb)
{
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
2007-03-29 12:04:40 UTC (rev 75130)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
2007-03-29 12:15:47 UTC (rev 75131)
@@ -5408,7 +5408,18 @@
#if NET_2_0
internal override void SystrayBalloon(IntPtr handle, int
timeout, string title, string text, ToolTipIcon icon)
{
- // TODO:
+ Control control = Control.FromHandle(handle);
+
+ if (control == null)
+ return;
+
+ NotifyIcon.BalloonWindow form = new
NotifyIcon.BalloonWindow (handle);
+ form.Title = title;
+ form.Text = text;
+ form.Timeout = timeout;
+ form.Show ();
+
+ SendMessage(handle, Msg.WM_USER, IntPtr.Zero, (IntPtr)
Msg.NIN_BALLOONSHOW);
}
#endif
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/ChangeLog
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/ChangeLog
2007-03-29 12:04:40 UTC (rev 75130)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/ChangeLog
2007-03-29 12:15:47 UTC (rev 75131)
@@ -1,3 +1,7 @@
+2007-03-29 Everaldo Canuto <[EMAIL PROTECTED]>
+
+ * XplatUIX11-new.cs: Implement SystrayBalloon for X11 systems.
+
2007-03-20 Everaldo Canuto <[EMAIL PROTECTED]>
* XplatUIX11-new.cs: Remove unneeded parameter owner in SetTopmost.
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/XplatUIX11-new.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/XplatUIX11-new.cs
2007-03-29 12:04:40 UTC (rev 75130)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/XplatUIX11-new.cs
2007-03-29 12:15:47 UTC (rev 75131)
@@ -1015,7 +1015,18 @@
#if NET_2_0
internal override void SystrayBalloon(IntPtr handle, int
timeout, string title, string text, ToolTipIcon icon)
{
- // TODO:
+ Control control = Control.FromHandle(handle);
+
+ if (control == null)
+ return;
+
+ NotifyIcon.BalloonWindow form = new
NotifyIcon.BalloonWindow (handle);
+ form.Title = title;
+ form.Text = text;
+ form.Timeout = timeout;
+ form.Show ();
+
+ SendMessage(handle, Msg.WM_USER, IntPtr.Zero, (IntPtr)
Msg.NIN_BALLOONSHOW);
}
#endif
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches