Tidying up code.

gui-cs · Oct 31, 2023 · 919df85 · 919df85
1 parent 2289293
commit 919df85
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/Terminal.Gui/ConsoleDrivers/WindowsDriver.cs b/Terminal.Gui/ConsoleDrivers/WindowsDriver.cs
@@ -103,12 +103,10 @@ public bool WriteToConsole (Size size, ExtendedRuneInfo [,] charInfoBuffer, Coor
 					var attr = ci.Attribute;
 
 					if (prev == null) {
-						SetAttribute (force16Colors, ci, attr);
+						SetAttribute (ci, attr);
 					} else if (attr != prev) {
-						if (_stringBuilder.Length > 0) {
-							ProcessWriteToConsole ();
-						}
-						SetAttribute (force16Colors, ci, attr);
+						ProcessWriteToConsole ();
+						SetAttribute (ci, attr);
 					}
 
 					_stringBuilder.Append (ci.Rune);
@@ -133,7 +131,7 @@ public bool WriteToConsole (Size size, ExtendedRuneInfo [,] charInfoBuffer, Coor
 
 			return result;
 
-			void SetAttribute (bool force16Colors, ExtendedRuneInfo ci, Attribute attr)
+			void SetAttribute (ExtendedRuneInfo ci, Attribute attr)
 			{
 				prev = attr;
 				SetTextAttribute (((int)ci.Attribute.Foreground.ColorName) |
@@ -151,6 +149,10 @@ void ProcessSurrogatePair (Rune nextRune, int col)
 
 			void ProcessWriteToConsole ()
 			{
+				if (_stringBuilder.Length == 0) {
+					return;
+				}
+
 				s = _stringBuilder.ToString ();
 				result = WriteConsole (_screenBuffer, s, (uint)(s.Length), out uint _, null);
 				GetScreenBufferInfo (ref csbi);