Author: jpobst
Date: 2008-01-14 16:11:18 -0500 (Mon, 14 Jan 2008)
New Revision: 92903
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUI.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIDriver.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
Log:
2008-01-14 Jonathan Pobst <[EMAIL PROTECTED]>
* Form.cs, XplatUI.cs, XplatUIDriver.cs, XplatUIX11.cs: Forms with
FixedToolWindow, SizeableToolWindow, or None for border styles have
different minimum sizes than regular forms. Implemented to fix
regression in PDN with toolbox being too wide.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2008-01-14 20:47:36 UTC (rev 92902)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2008-01-14 21:11:18 UTC (rev 92903)
@@ -1,3 +1,10 @@
+2008-01-14 Jonathan Pobst <[EMAIL PROTECTED]>
+
+ * Form.cs, XplatUI.cs, XplatUIDriver.cs, XplatUIX11.cs: Forms with
+ FixedToolWindow, SizeableToolWindow, or None for border styles have
+ different minimum sizes than regular forms. Implemented to fix
+ regression in PDN with toolbox being too wide.
+
2008-01-14 Andreia Gaita <[EMAIL PROTECTED]>
* HtmlElementCollection.cs: Implemented
@@ -27,7 +34,7 @@
Gendarme. Also put a MonoTodo on AutoWordSelect since we don't
respect the value set.
-2007-01-14 Everaldo Canuto <[EMAIL PROTECTED]>
+2008-01-14 Everaldo Canuto <[EMAIL PROTECTED]>
* Form.cs: In WmWindowPosChanged call base.WndProc including when state
is
minimized. Fixes bug #325122 for Win32. Thanks Srikanth Madikeri.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
2008-01-14 20:47:36 UTC (rev 92902)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
2008-01-14 21:11:18 UTC (rev 92903)
@@ -2308,10 +2308,27 @@
[EditorBrowsable(EditorBrowsableState.Advanced)]
protected override void SetBoundsCore(int x, int y, int width,
int height, BoundsSpecified specified) {
+ Size min_size;
+
+ switch (FormBorderStyle) {
+ case FormBorderStyle.None:
+ min_size =
XplatUI.MinimumNoBorderWindowSize;
+ break;
+ case FormBorderStyle.FixedToolWindow:
+ min_size =
XplatUI.MinimumFixedToolWindowSize;
+ break;
+ case FormBorderStyle.SizableToolWindow:
+ min_size =
XplatUI.MinimumSizeableToolWindowSize;
+ break;
+ default:
+ min_size =
SystemInformation.MinimumWindowSize;
+ break;
+ }
+
if ((specified & BoundsSpecified.Width) ==
BoundsSpecified.Width)
- width = Math.Max (width,
SystemInformation.MinimumWindowSize.Width);
+ width = Math.Max (width, min_size.Width);
if ((specified & BoundsSpecified.Height) ==
BoundsSpecified.Height)
- height = Math.Max (height,
SystemInformation.MinimumWindowSize.Height);
+ height = Math.Max (height, min_size.Height);
base.SetBoundsCore (x, y, width, height, specified);
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUI.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUI.cs
2008-01-14 20:47:36 UTC (rev 92902)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUI.cs
2008-01-14 21:11:18 UTC (rev 92903)
@@ -275,6 +275,18 @@
}
}
+ static public Size MinimumFixedToolWindowSize {
+ get { return driver.MinimumFixedToolWindowSize; }
+ }
+
+ static public Size MinimumSizeableToolWindowSize {
+ get { return driver.MinimumSizeableToolWindowSize; }
+ }
+
+ static public Size MinimumNoBorderWindowSize {
+ get { return driver.MinimumNoBorderWindowSize; }
+ }
+
static public Size MinWindowTrackSize {
get {
return driver.MinWindowTrackSize;
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIDriver.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIDriver.cs
2008-01-14 20:47:36 UTC (rev 92902)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIDriver.cs
2008-01-14 21:11:18 UTC (rev 92903)
@@ -226,6 +226,9 @@
internal abstract Size MinimizedWindowSize { get; }
internal abstract Size MinimizedWindowSpacingSize { get; }
internal abstract Size MinimumWindowSize { get; }
+ internal virtual Size MinimumFixedToolWindowSize { get { return
Size.Empty; } }
+ internal virtual Size MinimumSizeableToolWindowSize { get {
return Size.Empty; } }
+ internal virtual Size MinimumNoBorderWindowSize { get { return
Size.Empty; } }
internal abstract Size MinWindowTrackSize { get; }
internal abstract Size SmallIconSize { get; }
internal abstract int MouseButtonCount { get; }
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
2008-01-14 20:47:36 UTC (rev 92902)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
2008-01-14 21:11:18 UTC (rev 92903)
@@ -2131,6 +2131,18 @@
}
}
+ internal override Size MinimumFixedToolWindowSize {
+ get { return new Size (27, 22); }
+ }
+
+ internal override Size MinimumSizeableToolWindowSize {
+ get { return new Size (37, 22); }
+ }
+
+ internal override Size MinimumNoBorderWindowSize {
+ get { return new Size (2, 2); }
+ }
+
internal override Size MinWindowTrackSize {
get {
return new Size(1, 1);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches