mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.16.0.122

Browse Source 
Former-commit-id: 60dd6d91c5dc30a6569681c1b8d7cddebae4e52b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-08-28 08:15:10 +00:00
parent f8f43c9aed
commit 73002b0b4a
177 changed files with 232 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mcs/class/System.Windows.Forms/Makefile
View File

@ -142,3 +142,9 @@ notepad.exe: samples/notepad.cs $(topdir)/class/lib/$(PROFILE)/System.Windows.Fo
test-notepad: notepad.exe
$(TEST_RUNTIME) $(TEST_RUNTIME_FLAGS) notepad.exe
issue10235.exe: samples/issue10235.cs $(topdir)/class/lib/$(PROFILE)/System.Windows.Forms.dll $(topdir)/class/lib/$(PROFILE)/System.Drawing.dll $(topdir)/class/lib/$(PROFILE)/System.dll $(topdir)/class/lib/$(PROFILE)/mscorlib.dll
$(CSCOMPILE) -out:$@ samples/issue10235.cs -r:$(topdir)/class/lib/$(PROFILE)/System.Windows.Forms.dll -r:$(topdir)/class/lib/$(PROFILE)/System.Drawing.dll -r:$(topdir)/class/lib/$(PROFILE)/System.dll -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll
test-issue10235: issue10235.exe
$(TEST_RUNTIME) $(TEST_RUNTIME_FLAGS) issue10235.exe

9
mcs/class/System.Windows.Forms/System.Windows.Forms.Layout/DefaultLayout.cs
View File

@ -195,8 +195,13 @@ namespace System.Windows.Forms.Layout
{
IArrangedContainer parent = (IArrangedContainer)container;
LayoutDockedChildren (parent, parent.Controls);
LayoutAnchoredChildren (parent, parent.Controls);
if (parent.Controls is Control.ControlCollection controlCollection) {
LayoutDockedChildren (parent, controlCollection.GetAllControls());
LayoutAnchoredChildren (parent, controlCollection.GetAllControls());
} else {
LayoutDockedChildren (parent, parent.Controls);
LayoutAnchoredChildren (parent, parent.Controls);
}
return parent.AutoSize;
}

35
mcs/class/System.Windows.Forms/System.Windows.Forms/TextBoxBase.cs
View File

@ -73,6 +73,9 @@ namespace System.Windows.Forms
internal bool has_been_focused;
private bool delayed_font_or_color_change;
private int requested_height;
internal int selection_length = -1; // set to the user-specified selection length, or -1 if none
internal bool show_caret_w_selection; // TextBox shows the caret when the selection is visible
internal int canvas_width;
@ -163,6 +166,8 @@ namespace System.Windows.Forms
Cursor = Cursors.IBeam;
requested_height = Height;
can_cache_preferred_size = true;
}
#endregion // Internal Constructor
@ -1008,6 +1013,9 @@ namespace System.Windows.Forms
protected override void OnHandleCreated (EventArgs e)
{
base.OnHandleCreated (e);
if (delayed_font_or_color_change) {
TextBoxBase_FontOrColorChanged (this, e);
}
FixupHeight ();
}
@ -1467,20 +1475,13 @@ namespace System.Windows.Forms
{
// Make sure we don't get sized bigger than we want to be
if ((specified & BoundsSpecified.Height) != 0) {
requested_height = height;
}
if (!richtext) {
if (!document.multiline) {
if (height != PreferredHeight) {
// If the specified has Height, we need to store that in the
// ExplicitBounds because we are going to override it
if ((specified & BoundsSpecified.Height) != 0) {
Rectangle r = ExplicitBounds;
r.Height = height;
ExplicitBounds = r;
specified &= ~BoundsSpecified.Height;
}
height = PreferredHeight;
}
height = PreferredHeight;
}
}
@ -1763,13 +1764,15 @@ namespace System.Windows.Forms
private void FixupHeight ()
{
if (!richtext) {
int saved_requested_height = requested_height;
if (!document.multiline) {
if (PreferredHeight != Height) {
SetBoundsCore (Left, Top, Width, PreferredHeight, BoundsSpecified.None);
SetBoundsCore (Left, Top, Width, PreferredHeight, BoundsSpecified.Height);
}
} else {
SetBoundsCore (Left, Top, Width, Math.Max(PreferredHeight, ExplicitBounds.Height), BoundsSpecified.None);
SetBoundsCore (Left, Top, Width, Math.Max(PreferredHeight, requested_height), BoundsSpecified.Height);
}
requested_height = saved_requested_height;
}
}
@ -2238,8 +2241,10 @@ namespace System.Windows.Forms
{
Line line;
if (!IsHandleCreated)
if (!IsHandleCreated) {
delayed_font_or_color_change = true;
return;
}
document.SuspendRecalc ();
// Font changes apply to the whole document