Author: jpobst
Date: 2007-08-27 15:14:50 -0400 (Mon, 27 Aug 2007)
New Revision: 84913
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/LabelEditTextBox.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs
Log:
2007-08-27 Jonathan Pobst <[EMAIL PROTECTED]>
* LabelEditTextBox.cs, TreeView.cs: After hiding the textbox used
for label editting, make sure we focus back on the TreeView.
[Fixes bug #82590]
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-08-27 19:11:12 UTC (rev 84912)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-08-27 19:14:50 UTC (rev 84913)
@@ -1,3 +1,9 @@
+2007-08-27 Jonathan Pobst <[EMAIL PROTECTED]>
+
+ * LabelEditTextBox.cs, TreeView.cs: After hiding the textbox used
+ for label editting, make sure we focus back on the TreeView.
+ [Fixes bug #82590]
+
2007-08-27 Carlos Alberto Cortez <[EMAIL PROTECTED]>
* ListView.cs: Add some 2.0 overrides.
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/LabelEditTextBox.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/LabelEditTextBox.cs
2007-08-27 19:11:12 UTC (rev 84912)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/LabelEditTextBox.cs
2007-08-27 19:14:50 UTC (rev 84913)
@@ -57,11 +57,13 @@
switch (e.KeyCode) {
case Keys.Return:
Visible = false;
+ Parent.Focus ();
e.Handled = true;
OnEditingFinished (e);
break;
case Keys.Escape:
Visible = false;
+ Parent.Focus ();
e.Handled = true;
OnEditingCancelled (e);
break;
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs
2007-08-27 19:11:12 UTC (rev 84912)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs
2007-08-27 19:14:50 UTC (rev 84913)
@@ -1656,6 +1656,7 @@
{
if (edit_text_box != null && edit_text_box.Visible) {
edit_text_box.Visible = false;
+ Focus ();
}
if (edit_node != null && edit_node == node) {
@@ -1678,8 +1679,10 @@
{
edit_args.SetLabel (null);
- if (edit_text_box != null && edit_text_box.Visible)
+ if (edit_text_box != null && edit_text_box.Visible) {
edit_text_box.Visible = false;
+ Focus ();
+ }
edit_node = null;
UpdateNode (node);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches