From 1ba06048bfd4f007fec254bc964f2983c1793169 Mon Sep 17 00:00:00 2001
From: Syndamia <kamen@syndamia.com>
Date: Sun, 29 May 2022 08:08:50 +0300
Subject: Autocommit at 29.05.2022 @ 08:08

---
 src/Generic/ConsoleInterface/Toolbox.cpp | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'src/Generic/ConsoleInterface/Toolbox.cpp')

diff --git a/src/Generic/ConsoleInterface/Toolbox.cpp b/src/Generic/ConsoleInterface/Toolbox.cpp
index 5a434da..8a4470d 100644
--- a/src/Generic/ConsoleInterface/Toolbox.cpp
+++ b/src/Generic/ConsoleInterface/Toolbox.cpp
@@ -57,7 +57,11 @@ void __printTableLine(unsigned columns) {
 }
 
 void __printPadded(const String& str, unsigned width) {
-
+	while (str.get_length() - width > 0) {
+		width--;
+		print(" ");
+	}
+	print(str.get_cstr());
 }
 
 /*! \param startNumber The number by which column and row enumeration begins
@@ -81,17 +85,12 @@ void table(const List<String>& items, unsigned columns) {
 
 	for (unsigned i = 0; i < items.get_count(); i++) {
 		__printPadded(items[i], colWidths[i % columns]);
+		if (i > 0 && i % columns == 0)
+			printLine("");
+		else if (i % columns > 0 && i % columns < columns - 1)
+			print("|");
 	}
-	__printTableHeaderNumber(startNumber);
-	for (unsigned i = 0, colInd = 0, rowInd = 0; items[i] != '\0'; i++, (++colInd) %= columns) {
-		if (colInd == 0 && i != 0) {
-			std::cout << ":" << std::endl;
-			__printTableLine(columns);
-			__printTableHeaderNumber((++rowInd) + startNumber);
-		}
 
-		std::cout << ((colInd == 0) ? "║ " : "| ") << items[rowInd * columns + colInd] << " ";
-	}
-	std::cout << ":" << std::endl;
+	delete[] colWidths;
 }
 
-- 
cgit v1.3.1-23-gd82d