diff --git a/Terminal.Gui/ConsoleDrivers/WindowsDriver.cs b/Terminal.Gui/ConsoleDrivers/WindowsDriver.cs
index 896487ac3..21991f448 100644
--- a/Terminal.Gui/ConsoleDrivers/WindowsDriver.cs
+++ b/Terminal.Gui/ConsoleDrivers/WindowsDriver.cs
@@ -2344,11 +2344,9 @@ internal class WindowsMainLoop : IMainLoopDriver
internal class WindowsClipboard : ClipboardBase
{
- private const uint _cfUnicodeText = 13;
+ private const uint CF_UNICODE_TEXT = 13;
- public WindowsClipboard () { IsSupported = IsClipboardFormatAvailable (_cfUnicodeText); }
-
- public override bool IsSupported { get; }
+ public override bool IsSupported { get; } = IsClipboardFormatAvailable (CF_UNICODE_TEXT);
protected override string GetClipboardDataImpl ()
{
@@ -2359,7 +2357,7 @@ internal class WindowsClipboard : ClipboardBase
return string.Empty;
}
- nint handle = GetClipboardData (_cfUnicodeText);
+ nint handle = GetClipboardData (CF_UNICODE_TEXT);
if (handle == nint.Zero)
{
@@ -2431,7 +2429,7 @@ internal class WindowsClipboard : ClipboardBase
GlobalUnlock (target);
}
- if (SetClipboardData (_cfUnicodeText, hGlobal) == default (nint))
+ if (SetClipboardData (CF_UNICODE_TEXT, hGlobal) == default (nint))
{
ThrowWin32 ();
}
diff --git a/Terminal.Gui/Drawing/Justification.cs b/Terminal.Gui/Drawing/Justification.cs
index 16c76c372..f1fba56a8 100644
--- a/Terminal.Gui/Drawing/Justification.cs
+++ b/Terminal.Gui/Drawing/Justification.cs
@@ -96,7 +96,7 @@ public class Justifier
public int ContainerSize { get; set; }
///
- /// Gets or sets whether puts a space is placed between items. Default is . If , a space will be
+ /// Gets or sets whether puts a space is placed between items. Default is . If , a space will be
/// placed between each item, which is useful for justifying text.
///
public bool PutSpaceBetweenItems { get; set; }
@@ -118,6 +118,7 @@ public class Justifier
///
/// The sizes of the items to justify.
/// The justification style.
+ ///
/// The size of the container.
/// The locations of the items, from left to right.
public static int [] Justify (Justification justification, bool putSpaceBetweenItems, int containerSize, int [] sizes)
diff --git a/Terminal.Gui/Text/TextFormatter.cs b/Terminal.Gui/Text/TextFormatter.cs
index 5d60ba89a..925f89a38 100644
--- a/Terminal.Gui/Text/TextFormatter.cs
+++ b/Terminal.Gui/Text/TextFormatter.cs
@@ -662,7 +662,7 @@ public class TextFormatter
///
///
/// If the text needs to be formatted (if is )
- /// will be called and upon return
+ /// will be called and upon return
/// will be .
///
///
diff --git a/Terminal.sln.DotSettings b/Terminal.sln.DotSettings
index 3bc1fab5d..ca15b5583 100644
--- a/Terminal.sln.DotSettings
+++ b/Terminal.sln.DotSettings
@@ -387,6 +387,7 @@
<Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" />
<Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" />
<Policy><Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static readonly fields (private)"><ElementKinds><Kind Name="READONLY_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /></Policy>
+ <Policy><Descriptor Staticness="Any" AccessRightKinds="Private" Description="Constant fields (private)"><ElementKinds><Kind Name="CONSTANT_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /></Policy>
<Policy><Descriptor Staticness="Instance" AccessRightKinds="Protected, ProtectedInternal, Internal, Public, PrivateProtected" Description="Instance fields (not private)"><ElementKinds><Kind Name="FIELD" /><Kind Name="READONLY_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /></Policy>
<Policy><Descriptor Staticness="Static" AccessRightKinds="Protected, ProtectedInternal, Internal, Public, PrivateProtected" Description="Static fields (not private)"><ElementKinds><Kind Name="FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /></Policy>
<Policy><Descriptor Staticness="Static" AccessRightKinds="Protected, ProtectedInternal, Internal, Public, PrivateProtected" Description="Static readonly fields (not private)"><ElementKinds><Kind Name="READONLY_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /></Policy>
diff --git a/UnitTests/View/FindDeepestViewTests.cs b/UnitTests/View/FindDeepestViewTests.cs
index 8f99e095c..67687702d 100644
--- a/UnitTests/View/FindDeepestViewTests.cs
+++ b/UnitTests/View/FindDeepestViewTests.cs
@@ -8,7 +8,7 @@ namespace Terminal.Gui.ViewTests;
/// Tests View.FindDeepestView
///
///
-public class FindDeepestViewTests (ITestOutputHelper output)
+public class FindDeepestViewTests ()
{
[Theory]
[InlineData (0, 0, 0, 0, 0, -1, -1, null)]
@@ -249,7 +249,6 @@ public class FindDeepestViewTests (ITestOutputHelper output)
[InlineData (2, 3, true)]
[InlineData (5, 6, true)]
- [InlineData (2, 3, true)]
[InlineData (6, 7, true)]
public void Returns_Correct_If_Start_Has_Adornments (int testX, int testY, bool expectedSubViewFound)
{
@@ -303,15 +302,14 @@ public class FindDeepestViewTests (ITestOutputHelper output)
}
[Theory]
+ [InlineData (9, 9, true)]
[InlineData (0, 0, false)]
[InlineData (1, 1, false)]
- [InlineData (9, 9, true)]
[InlineData (10, 10, false)]
[InlineData (7, 8, false)]
[InlineData (1, 2, false)]
[InlineData (2, 3, false)]
[InlineData (5, 6, false)]
- [InlineData (2, 3, false)]
[InlineData (6, 7, false)]
public void Returns_Correct_If_Start_Has_Adornment_WithSubview (int testX, int testY, bool expectedSubViewFound)
{
@@ -365,7 +363,7 @@ public class FindDeepestViewTests (ITestOutputHelper output)
start.Add (subview);
var found = View.FindDeepestView (start, testX, testY);
- Assert.Equal (expectedAdornmentType, found.GetType ());
+ Assert.Equal (expectedAdornmentType, found!.GetType ());
}
// Test that FindDeepestView works if the subview has positive Adornments
@@ -379,7 +377,6 @@ public class FindDeepestViewTests (ITestOutputHelper output)
[InlineData (1, 2, false)]
[InlineData (5, 6, false)]
- [InlineData (2, 3, true)]
[InlineData (2, 3, true)]
public void Returns_Correct_If_SubView_Has_Adornments (int testX, int testY, bool expectedSubViewFound)
{
@@ -533,6 +530,6 @@ public class FindDeepestViewTests (ITestOutputHelper output)
start.Add (subviews [0]);
var found = View.FindDeepestView (start, testX, testY);
- Assert.Equal (expectedSubViewFound, subviews.IndexOf (found));
+ Assert.Equal (expectedSubViewFound, subviews.IndexOf (found!));
}
}
diff --git a/UnitTests/View/Layout/ViewportTests.cs b/UnitTests/View/Layout/ViewportTests.cs
index cd576c210..a4fa24c26 100644
--- a/UnitTests/View/Layout/ViewportTests.cs
+++ b/UnitTests/View/Layout/ViewportTests.cs
@@ -248,7 +248,7 @@ public class ViewportTests (ITestOutputHelper output)
view.Viewport = newViewport;
// Assert
- Assert.Equal (new Rectangle(expectedX, expectedY, viewWidth, viewHeight), view.Viewport);
+ Assert.Equal (new Rectangle (expectedX, expectedY, viewWidth, viewHeight), view.Viewport);
}
[Theory]
@@ -321,18 +321,9 @@ public class ViewportTests (ITestOutputHelper output)
}
[Theory]
- [InlineData (0, 0, 0)]
- [InlineData (1, 0, 0)]
- [InlineData (-1, 0, 0)]
- [InlineData (10, 0, 0)]
- [InlineData (11, 0, 0)]
-
- [InlineData (0, 1, 1)]
- [InlineData (1, 1, 1)]
- [InlineData (-1, 1, 1)]
- [InlineData (10, 1, 1)]
- [InlineData (11, 1, 1)]
- public void GetViewportOffset_Returns_Offset_From_Frame (int frameX, int adornmentThickness, int expectedOffset)
+ [InlineData (0, 0)]
+ [InlineData (1, 1)]
+ public void GetViewportOffset_Returns_Offset_From_Frame (int adornmentThickness, int expectedOffset)
{
View view = new ()
{
diff --git a/UnitTests/View/MouseTests.cs b/UnitTests/View/MouseTests.cs
index e7e0fc5d9..e03090a3d 100644
--- a/UnitTests/View/MouseTests.cs
+++ b/UnitTests/View/MouseTests.cs
@@ -378,7 +378,7 @@ public class MouseTests (ITestOutputHelper output) : TestsAllViews
Assert.Equal (0, clickedCount);
me.Handled = false;
- me.Flags =clicked;
+ me.Flags = clicked;
view.NewMouseEvent (me);
Assert.Equal (1, clickedCount);
@@ -387,11 +387,11 @@ public class MouseTests (ITestOutputHelper output) : TestsAllViews
[Theory]
- [InlineData (MouseFlags.Button1Pressed, MouseFlags.Button1Released, MouseFlags.Button1Clicked)]
- [InlineData (MouseFlags.Button2Pressed, MouseFlags.Button2Released, MouseFlags.Button2Clicked)]
- [InlineData (MouseFlags.Button3Pressed, MouseFlags.Button3Released, MouseFlags.Button3Clicked)]
- [InlineData (MouseFlags.Button4Pressed, MouseFlags.Button4Released, MouseFlags.Button4Clicked)]
- public void WantContinuousButtonPressed_True_Button_Clicked_Clicks (MouseFlags pressed, MouseFlags released, MouseFlags clicked)
+ [InlineData (MouseFlags.Button1Clicked)]
+ [InlineData (MouseFlags.Button2Clicked)]
+ [InlineData (MouseFlags.Button3Clicked)]
+ [InlineData (MouseFlags.Button4Clicked)]
+ public void WantContinuousButtonPressed_True_Button_Clicked_Clicks (MouseFlags clicked)
{
var me = new MouseEvent ();
@@ -405,7 +405,7 @@ public class MouseTests (ITestOutputHelper output) : TestsAllViews
var clickedCount = 0;
view.MouseClick += (s, e) => clickedCount++;
-
+
me.Flags = clicked;
view.NewMouseEvent (me);
Assert.Equal (1, clickedCount);
@@ -414,11 +414,11 @@ public class MouseTests (ITestOutputHelper output) : TestsAllViews
}
[Theory]
- [InlineData (MouseFlags.Button1Pressed, MouseFlags.Button1Released, MouseFlags.Button1Clicked)]
- [InlineData (MouseFlags.Button2Pressed, MouseFlags.Button2Released, MouseFlags.Button2Clicked)]
- [InlineData (MouseFlags.Button3Pressed, MouseFlags.Button3Released, MouseFlags.Button3Clicked)]
- [InlineData (MouseFlags.Button4Pressed, MouseFlags.Button4Released, MouseFlags.Button4Clicked)]
- public void WantContinuousButtonPressed_True_Button_Press_Release_Clicks (MouseFlags pressed, MouseFlags released, MouseFlags clicked)
+ [InlineData (MouseFlags.Button1Pressed, MouseFlags.Button1Released)]
+ [InlineData (MouseFlags.Button2Pressed, MouseFlags.Button2Released)]
+ [InlineData (MouseFlags.Button3Pressed, MouseFlags.Button3Released)]
+ [InlineData (MouseFlags.Button4Pressed, MouseFlags.Button4Released)]
+ public void WantContinuousButtonPressed_True_Button_Press_Release_Clicks (MouseFlags pressed, MouseFlags released)
{
var me = new MouseEvent ();