From be022462b54ef39b4fd5bb1c6ba8d5b6006a42c3 Mon Sep 17 00:00:00 2001 From: Charlie Kindel Date: Thu, 21 May 2020 20:24:59 -0600 Subject: [PATCH 1/2] Added DateField and illustrates layout issues and crashes --- UICatalog/Scenarios/TimeAndDate.cs | 56 ++++++++++++++++++++++++------ 1 file changed, 45 insertions(+), 11 deletions(-) diff --git a/UICatalog/Scenarios/TimeAndDate.cs b/UICatalog/Scenarios/TimeAndDate.cs index 3ac2cd3fc..6824fea36 100644 --- a/UICatalog/Scenarios/TimeAndDate.cs +++ b/UICatalog/Scenarios/TimeAndDate.cs @@ -8,22 +8,56 @@ namespace UICatalog { class TimeAndDate : Scenario { public override void Setup () { - // NOTE: The TimeField control is not ready for prime-time. + // NOTE: The TimeField control is not ready for prime-time. See #246 - Win.Add (new TimeField (0, 0, DateTime.Now, isShort: false) { + var longTime = new TimeField (0, 0, DateTime.Now, isShort: false) { // BUGBUG: TimeField does not support Computed Layout - //X = Pos.Center (), - //Y = Pos.Center () - 1, - X = 10, + X = Pos.Center (), Y = 2, - }); + ReadOnly = false, + }; + Win.Add (longTime); - Win.Add (new TimeField (0, 2, DateTime.Now, isShort: true) { + var shortTime = new TimeField (0, 2, DateTime.Now, isShort: true) { // BUGBUG: TimeField does not support Computed Layout - //X = Pos.Center (), - //Y = Pos.Center () + 1, - X = 10, - Y = 3, + X = Pos.Center (), + Y = Pos.Bottom(longTime) + 1, + ReadOnly = true, + }; + Win.Add (shortTime); + + var shortDate = new DateField (0, 2, DateTime.Now, isShort: true) { + // BUGBUG: TimeField does not support Computed Layout + X = Pos.Center (), + Y = Pos.Bottom (shortTime) + 1, + ReadOnly = true, + }; + Win.Add (shortDate); + + var longDate = new TimeField (0, 2, DateTime.Now, isShort: true) { + // BUGBUG: TimeField does not support Computed Layout + X = Pos.Center (), + Y = Pos.Bottom (shortDate) + 1, + ReadOnly = true, + }; + Win.Add (longDate); + + Win.Add (new Button ("Swap Long/Short & Read/Read Only") { + X = Pos.Center (), + Y = Pos.Bottom (Win) - 5, + Clicked = () => { + longTime.ReadOnly = !longTime.ReadOnly; + shortTime.ReadOnly = !shortTime.ReadOnly; + + longTime.IsShortFormat = !longTime.IsShortFormat; + shortTime.IsShortFormat = !shortTime.IsShortFormat; + + longDate.ReadOnly = !longDate.ReadOnly; + shortDate.ReadOnly = !shortDate.ReadOnly; + + longDate.IsShortFormat = !longDate.IsShortFormat; + shortDate.IsShortFormat = !shortDate.IsShortFormat; + } }); } } From 306eb68221cb742407bf238a2aa1fe723b3b4ae1 Mon Sep 17 00:00:00 2001 From: Charlie Kindel Date: Thu, 21 May 2020 21:07:43 -0600 Subject: [PATCH 2/2] rebase --- UICatalog/Scenarios/TimeAndDate.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/UICatalog/Scenarios/TimeAndDate.cs b/UICatalog/Scenarios/TimeAndDate.cs index 6824fea36..ebbf32333 100644 --- a/UICatalog/Scenarios/TimeAndDate.cs +++ b/UICatalog/Scenarios/TimeAndDate.cs @@ -49,14 +49,14 @@ namespace UICatalog { longTime.ReadOnly = !longTime.ReadOnly; shortTime.ReadOnly = !shortTime.ReadOnly; - longTime.IsShortFormat = !longTime.IsShortFormat; - shortTime.IsShortFormat = !shortTime.IsShortFormat; + //longTime.IsShortFormat = !longTime.IsShortFormat; + //shortTime.IsShortFormat = !shortTime.IsShortFormat; longDate.ReadOnly = !longDate.ReadOnly; shortDate.ReadOnly = !shortDate.ReadOnly; - longDate.IsShortFormat = !longDate.IsShortFormat; - shortDate.IsShortFormat = !shortDate.IsShortFormat; + //longDate.IsShortFormat = !longDate.IsShortFormat; + //shortDate.IsShortFormat = !shortDate.IsShortFormat; } }); }