2008-09-15 Jonathan Pobst <[email protected]>

* TextBoxBase.cs: If the user is using Ctrl-Tab to move focus, we have to remove the Ctrl in order for the focus moving code to kick in. [Fixes bug #426170] svn path=/trunk/mcs/; revision=113081
monojenkins · Sep 15, 2008 · 6eb9a61 · 6eb9a61
1 parent e92f25b
commit 6eb9a61
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-15  Jonathan Pobst  <[email protected]>
+
+	* TextBoxBase.cs: If the user is using Ctrl-Tab to move focus, we
+	have to remove the Ctrl in order for the focus moving code to kick in.
+	[Fixes bug #426170]
+
 2008-09-15  Jonathan Pobst  <[email protected]>
 
 	* CheckedListBox.cs: Return the real item index from Add.  It may not be

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBoxBase.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBoxBase.cs
@@ -1109,6 +1109,12 @@ protected override bool ProcessCmdKey (ref Message msg, Keys keyData)
 #endif
 		protected override bool ProcessDialogKey (Keys keyData)
 		{
+			// The user can use Ctrl-Tab or Ctrl-Shift-Tab to move control focus
+			// instead of inserting a Tab.  However, the focus-moving-tab-stuffs
+			// doesn't work if Ctrl is pushed, so we remove it before sending it.
+			if (accepts_tab && (keyData & (Keys.Control | Keys.Tab)) == (Keys.Control | Keys.Tab))
+				keyData ^= Keys.Control;
+
 			return base.ProcessDialogKey(keyData);
 		}