Author: jpobst
Date: 2007-07-20 18:10:23 -0400 (Fri, 20 Jul 2007)
New Revision: 82389
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeNode.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs
Log:
2007-07-20 Jonathan Pobst <[EMAIL PROTECTED]>
* TreeNode.cs: Implement ToolTipText.
* TreeView.cs: Implement tooltips, NodeMouse* events.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-07-20 20:56:39 UTC (rev 82388)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-07-20 22:10:23 UTC (rev 82389)
@@ -1,5 +1,10 @@
2007-07-20 Jonathan Pobst <[EMAIL PROTECTED]>
+ * TreeNode.cs: Implement ToolTipText.
+ * TreeView.cs: Implement tooltips, NodeMouse* events.
+
+2007-07-20 Jonathan Pobst <[EMAIL PROTECTED]>
+
* TreeView.cs: Implement OnNodeMouseClick and OnNodeMouseDoubleClick.
2007-07-20 Jonathan Pobst <[EMAIL PROTECTED]>
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeNode.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeNode.cs
2007-07-20 20:56:39 UTC (rev 82388)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeNode.cs
2007-07-20 22:10:23 UTC (rev 82389)
@@ -50,6 +50,7 @@
private string selected_image_key = String.Empty;
private int state_image_index = -1;
private string state_image_key = String.Empty;
+ private string tool_tip_text = String.Empty;
#endif
internal TreeNodeCollection nodes;
internal TreeViewAction check_reason = TreeViewAction.Unknown;
@@ -662,6 +663,13 @@
}
#if NET_2_0
+ [DefaultValue ("")]
+ [Localizable (false)]
+ public string ToolTipText {
+ get { return tool_tip_text; }
+ set { tool_tip_text = value; }
+ }
+
[Browsable (false)]
#endif
public TreeView TreeView {
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs
2007-07-20 20:56:39 UTC (rev 82388)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs
2007-07-20 22:10:23 UTC (rev 82389)
@@ -63,10 +63,14 @@
#if NET_2_0
private string image_key;
+ private bool is_hovering;
private TreeNode mouse_click_node;
private bool right_to_left_layout;
private string selected_image_key;
+ private bool show_node_tool_tips;
private ImageList state_image_list;
+ private TreeNode tooltip_currently_showing;
+ private ToolTip.ToolTipWindow tooltip_window;
#endif
private bool full_row_select;
private bool hot_tracking;
@@ -470,6 +474,14 @@
}
}
+#if NET_2_0
+ [DefaultValue (false)]
+ public bool ShowNodeToolTips {
+ get { return show_node_tool_tips; }
+ set { show_node_tool_tips = value; }
+ }
+#endif
+
[DefaultValue(true)]
public bool ShowPlusMinus {
get { return show_plus_minus; }
@@ -969,6 +981,28 @@
}
#if NET_2_0
+ protected override void OnMouseHover (EventArgs e)
+ {
+ base.OnMouseHover (e);
+
+ is_hovering = true;
+
+ TreeNode tn = GetNodeAt (PointToClient (MousePosition));
+
+ if (tn != null)
+ MouseEnteredItem (tn);
+ }
+
+ protected override void OnMouseLeave (EventArgs e)
+ {
+ base.OnMouseLeave (e);
+
+ is_hovering = false;
+
+ if (tooltip_currently_showing != null)
+ MouseLeftItem (tooltip_currently_showing);
+ }
+
protected virtual void OnNodeMouseClick
(TreeNodeMouseClickEventArgs e)
{
TreeNodeMouseClickEventHandler eh =
(TreeNodeMouseClickEventHandler)(Events[NodeMouseClickEvent]);
@@ -982,6 +1016,13 @@
if (eh != null)
eh (this, e);
}
+
+ protected virtual void OnNodeMouseHover
(TreeNodeMouseHoverEventArgs e)
+ {
+ TreeNodeMouseHoverEventHandler eh =
(TreeNodeMouseHoverEventHandler)(Events[NodeMouseHoverEvent]);
+ if (eh != null)
+ eh (this, e);
+ }
#endif
protected virtual void OnItemDrag (ItemDragEventArgs e)
@@ -2035,7 +2076,19 @@
}
private void MouseMoveHandler (object sender, MouseEventArgs e)
{
-
+#if NET_2_0
+ // XXX - This should use HitTest and only fire when we
are over
+ // the important parts of a node, not things like
gridlines or
+ // whitespace
+ TreeNode tn = GetNodeAt (e.Location);
+
+ if (tn != tooltip_currently_showing)
+ MouseLeftItem (tooltip_currently_showing);
+
+ if (tn != null && tn != tooltip_currently_showing)
+ MouseEnteredItem (tn);
+#endif
+
if (e.Button == MouseButtons.Left || e.Button ==
MouseButtons.Right) {
if (drag_begin_x == -1 && drag_begin_y == -1) {
drag_begin_x = e.X;
@@ -2124,6 +2177,39 @@
return true;
}
#endif
+
+ #region Stuff for ToolTips
+#if NET_2_0
+ private void MouseEnteredItem (TreeNode item)
+ {
+ tooltip_currently_showing = item;
+
+ if (!is_hovering)
+ return;
+
+ if (ShowNodeToolTips && !string.IsNullOrEmpty
(tooltip_currently_showing.ToolTipText))
+ ToolTipWindow.Present (this,
tooltip_currently_showing.ToolTipText);
+
+ OnNodeMouseHover (new TreeNodeMouseHoverEventArgs
(tooltip_currently_showing));
+ }
+
+ private void MouseLeftItem (TreeNode item)
+ {
+ ToolTipWindow.Hide ();
+ tooltip_currently_showing = null;
+ }
+
+ private ToolTip.ToolTipWindow ToolTipWindow {
+ get {
+ if (tooltip_window == null)
+ tooltip_window = new
ToolTip.ToolTipWindow ();
+
+ return tooltip_window;
+ }
+ }
+#endif
+ #endregion
+
#endregion // Internal & Private Methods and Properties
#region Events
@@ -2142,6 +2228,7 @@
static object DrawNodeEvent = new object ();
static object NodeMouseClickEvent = new object ();
static object NodeMouseDoubleClickEvent = new object();
+ static object NodeMouseHoverEvent = new object ();
static object RightToLeftLayoutChangedEvent = new object ();
#endif
@@ -2217,6 +2304,11 @@
remove { Events.RemoveHandler
(NodeMouseDoubleClickEvent, value); }
}
+ public event TreeNodeMouseHoverEventHandler NodeMouseHover {
+ add { Events.AddHandler (NodeMouseHoverEvent, value); }
+ remove { Events.RemoveHandler (NodeMouseHoverEvent,
value); }
+ }
+
public event EventHandler RightToLeftLayoutChanged {
add { Events.AddHandler (RightToLeftLayoutChangedEvent,
value); }
remove { Events.RemoveHandler
(RightToLeftLayoutChangedEvent, value); }
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches