Author: pbartok
Date: 2006-01-13 00:48:19 -0500 (Fri, 13 Jan 2006)
New Revision: 55491
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBoxBase.cs
Log:
2006-01-12 Peter Dennis Bartok <[EMAIL PROTECTED]>
* Control.cs: Undid my selection check fix, since it's not needed
* TextBoxBase.cs:
- Now considering the presence of hscroll/vscroll when sizing
vscroll/hscroll respectively. Fixed bug #77077
- Added Left/Up/Down/Right to IsInputKey list to prevent
ContainerControl from stealing them. This fixes what I broke
with my last checkin.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-01-13 05:22:11 UTC (rev 55490)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-01-13 05:48:19 UTC (rev 55491)
@@ -1,3 +1,13 @@
+2006-01-12 Peter Dennis Bartok <[EMAIL PROTECTED]>
+
+ * Control.cs: Undid my selection check fix, since it's not needed
+ * TextBoxBase.cs:
+ - Now considering the presence of hscroll/vscroll when sizing
+ vscroll/hscroll respectively. Fixed bug #77077
+ - Added Left/Up/Down/Right to IsInputKey list to prevent
+ ContainerControl from stealing them. This fixes what I broke
+ with my last checkin.
+
2006-01-12 Peter Dennis Bartok <[EMAIL PROTECTED]>
* ScrollableControl.cs: Implemented dockpadding. Fixes #77166. And
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
2006-01-13 05:22:11 UTC (rev 55490)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
2006-01-13 05:48:19 UTC (rev 55491)
@@ -2950,7 +2950,7 @@
break;
}
- if (c.CanSelect && (c != ctl) && ((c.parent ==
ctl.parent) || nested) && (c.tab_stop || !tabStopOnly)) {
+ if (c.CanSelect && ((c.parent == ctl.parent) ||
nested) && (c.tab_stop || !tabStopOnly)) {
Select(c);
return true;
}
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBoxBase.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBoxBase.cs
2006-01-13 05:22:11 UTC (rev 55490)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBoxBase.cs
2006-01-13 05:48:19 UTC (rev 55491)
@@ -671,13 +671,16 @@
return false;
}
+ case Keys.Left:
+ case Keys.Right:
+ case Keys.Up:
+ case Keys.Down:
case Keys.PageUp:
case Keys.PageDown:
case Keys.Home:
case Keys.End: {
return true;
}
-
}
return false;
}
@@ -1369,8 +1372,8 @@
canvas_height = ClientSize.Height;
// We always move them, they just might not be displayed
- hscroll.Bounds = new Rectangle (ClientRectangle.Left,
ClientRectangle.Bottom - hscroll.Height, ClientSize.Width, hscroll.Height);
- vscroll.Bounds = new Rectangle (ClientRectangle.Right -
vscroll.Width, ClientRectangle.Top, vscroll.Width, ClientSize.Height);
+ hscroll.Bounds = new Rectangle (ClientRectangle.Left,
ClientRectangle.Bottom - hscroll.Height, ClientSize.Width - (vscroll.Visible ?
SystemInformation.VerticalScrollBarWidth : 0), hscroll.Height);
+ vscroll.Bounds = new Rectangle (ClientRectangle.Right -
vscroll.Width, ClientRectangle.Top, vscroll.Width, ClientSize.Height -
(hscroll.Visible ? SystemInformation.HorizontalScrollBarHeight : 0));
}
@@ -1462,6 +1465,8 @@
hscroll.Maximum += vscroll.Width * 2;
canvas_width = ClientSize.Width - vscroll.Width
* 2;
}
+
+ TextBoxBase_SizeChanged(this, EventArgs.Empty);
}
private void document_WidthChanged(object sender, EventArgs e) {
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
