mirror of
https://github.com/gui-cs/Terminal.Gui.git
synced 2026-01-01 08:50:25 +01:00
Resolving merge conflicts
This commit is contained in:
@@ -6916,7 +6916,7 @@ line.
|
||||
{
|
||||
string [] lines = _textView.Text.Split (Environment.NewLine);
|
||||
|
||||
if (lines == null || lines.Length == 0)
|
||||
if (lines is { Length: 0 })
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
@@ -7024,11 +7024,11 @@ line.
|
||||
List<List<Cell>> text =
|
||||
[
|
||||
Cell.ToCells (
|
||||
"This is the first line.".ToRunes ()
|
||||
"This is the first line.".ToStringList ()
|
||||
),
|
||||
|
||||
Cell.ToCells (
|
||||
"This is the second line.".ToRunes ()
|
||||
"This is the second line.".ToStringList ()
|
||||
)
|
||||
];
|
||||
TextView tv = CreateTextView ();
|
||||
@@ -7091,12 +7091,9 @@ line. ",
|
||||
{
|
||||
string csName = color.Key;
|
||||
|
||||
foreach (Rune rune in csName.EnumerateRunes ())
|
||||
{
|
||||
cells.Add (new () { Rune = rune, Attribute = color.Value.Normal });
|
||||
}
|
||||
cells.AddRange (Cell.ToCellList (csName, color.Value.Normal));
|
||||
|
||||
cells.Add (new () { Rune = (Rune)'\n', Attribute = color.Value.Focus });
|
||||
cells.Add (new () { Grapheme = "\n", Attribute = color.Value.Focus });
|
||||
}
|
||||
|
||||
TextView tv = CreateTextView ();
|
||||
|
||||
Reference in New Issue
Block a user