From 73de270a8bd7d3fb8f19bfc9772fc280db434940 Mon Sep 17 00:00:00 2001
From: BDisp <bd.bdisp@gmail.com>
Date: Wed, 29 Nov 2023 16:49:14 +0000
Subject: [PATCH] DateField and TimeField depends on LayoutStyle.Computed.

---
 Terminal.Gui/Views/DateField.cs   | 1 +
 Terminal.Gui/Views/TimeField.cs   | 1 +
 UnitTests/Views/DateFieldTests.cs | 8 ++++----
 UnitTests/Views/TimeFieldTests.cs | 8 ++++----
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Terminal.Gui/Views/DateField.cs b/Terminal.Gui/Views/DateField.cs
index 2da853331..8b96a73d0 100644
--- a/Terminal.Gui/Views/DateField.cs
+++ b/Terminal.Gui/Views/DateField.cs
@@ -70,6 +70,7 @@ namespace Terminal.Gui {
 		void Initialize (DateTime date, bool isShort = false)
 		{
 			CultureInfo cultureInfo = CultureInfo.CurrentCulture;
+			LayoutStyle = LayoutStyle.Computed;
 			sepChar = cultureInfo.DateTimeFormat.DateSeparator;
 			longFormat = GetLongFormat (cultureInfo.DateTimeFormat.ShortDatePattern);
 			shortFormat = GetShortFormat (longFormat);
diff --git a/Terminal.Gui/Views/TimeField.cs b/Terminal.Gui/Views/TimeField.cs
index ff0b7198b..b5bf56323 100644
--- a/Terminal.Gui/Views/TimeField.cs
+++ b/Terminal.Gui/Views/TimeField.cs
@@ -70,6 +70,7 @@ namespace Terminal.Gui {
 		void Initialize (TimeSpan time, bool isShort = false)
 		{
 			CultureInfo cultureInfo = CultureInfo.CurrentCulture;
+			LayoutStyle = LayoutStyle.Computed;
 			sepChar = cultureInfo.DateTimeFormat.TimeSeparator;
 			longFormat = $" hh\\{sepChar}mm\\{sepChar}ss";
 			shortFormat = $" hh\\{sepChar}mm";
diff --git a/UnitTests/Views/DateFieldTests.cs b/UnitTests/Views/DateFieldTests.cs
index 26774ed88..71476bb52 100644
--- a/UnitTests/Views/DateFieldTests.cs
+++ b/UnitTests/Views/DateFieldTests.cs
@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Xunit;
 
 namespace Terminal.Gui.ViewsTests {
@@ -16,6 +12,7 @@ namespace Terminal.Gui.ViewsTests {
 			Assert.Equal (DateTime.MinValue, df.Date);
 			Assert.Equal (1, df.CursorPosition);
 			Assert.Equal (new Rect (0, 0, 12, 1), df.Frame);
+			Assert.Equal (LayoutStyle.Computed, df.LayoutStyle);
 
 			var date = DateTime.Now;
 			df = new DateField (date);
@@ -23,18 +20,21 @@ namespace Terminal.Gui.ViewsTests {
 			Assert.Equal (date, df.Date);
 			Assert.Equal (1, df.CursorPosition);
 			Assert.Equal (new Rect (0, 0, 12, 1), df.Frame);
+			Assert.Equal (LayoutStyle.Computed, df.LayoutStyle);
 
 			df = new DateField (1, 2, date);
 			Assert.False (df.IsShortFormat);
 			Assert.Equal (date, df.Date);
 			Assert.Equal (1, df.CursorPosition);
 			Assert.Equal (new Rect (1, 2, 12, 1), df.Frame);
+			Assert.Equal (LayoutStyle.Computed, df.LayoutStyle);
 
 			df = new DateField (3, 4, date, true);
 			Assert.True (df.IsShortFormat);
 			Assert.Equal (date, df.Date);
 			Assert.Equal (1, df.CursorPosition);
 			Assert.Equal (new Rect (3, 4, 10, 1), df.Frame);
+			Assert.Equal (LayoutStyle.Computed, df.LayoutStyle);
 
 			df.IsShortFormat = false;
 			Assert.Equal (new Rect (3, 4, 12, 1), df.Frame);
diff --git a/UnitTests/Views/TimeFieldTests.cs b/UnitTests/Views/TimeFieldTests.cs
index 3cefeb503..66c41da9a 100644
--- a/UnitTests/Views/TimeFieldTests.cs
+++ b/UnitTests/Views/TimeFieldTests.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Xunit;
 
 namespace Terminal.Gui.ViewsTests {
@@ -15,6 +11,7 @@ namespace Terminal.Gui.ViewsTests {
 			Assert.Equal (TimeSpan.MinValue, tf.Time);
 			Assert.Equal (1, tf.CursorPosition);
 			Assert.Equal (new Rect (0, 0, 10, 1), tf.Frame);
+			Assert.Equal (LayoutStyle.Computed, tf.LayoutStyle);
 
 			var time = DateTime.Now.TimeOfDay;
 			tf = new TimeField (time);
@@ -22,18 +19,21 @@ namespace Terminal.Gui.ViewsTests {
 			Assert.Equal (time, tf.Time);
 			Assert.Equal (1, tf.CursorPosition);
 			Assert.Equal (new Rect (0, 0, 10, 1), tf.Frame);
+			Assert.Equal (LayoutStyle.Computed, tf.LayoutStyle);
 
 			tf = new TimeField (1, 2, time);
 			Assert.False (tf.IsShortFormat);
 			Assert.Equal (time, tf.Time);
 			Assert.Equal (1, tf.CursorPosition);
 			Assert.Equal (new Rect (1, 2, 10, 1), tf.Frame);
+			Assert.Equal (LayoutStyle.Computed, tf.LayoutStyle);
 
 			tf = new TimeField (3, 4, time, true);
 			Assert.True (tf.IsShortFormat);
 			Assert.Equal (time, tf.Time);
 			Assert.Equal (1, tf.CursorPosition);
 			Assert.Equal (new Rect (3, 4, 7, 1), tf.Frame);
+			Assert.Equal (LayoutStyle.Computed, tf.LayoutStyle);
 
 			tf.IsShortFormat = false;
 			Assert.Equal (new Rect (3, 4, 10, 1), tf.Frame);