From 6fda8d7e23d39a4cf4558009b91b4986663d825e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 27 Jul 2023 08:18:53 +0530
Subject: [PATCH] unicode-input: Fix single column rendering of table

---
 kittens/unicode_input/main.go  | 3 +++
 kittens/unicode_input/table.go | 7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/kittens/unicode_input/main.go b/kittens/unicode_input/main.go
index efcb1706a..f656bc747 100644
--- a/kittens/unicode_input/main.go
+++ b/kittens/unicode_input/main.go
@@ -13,6 +13,7 @@ import (
 	"unicode"
 
 	"kitty/tools/cli"
+	"kitty/tools/tty"
 	"kitty/tools/tui"
 	"kitty/tools/tui/loop"
 	"kitty/tools/tui/readline"
@@ -250,6 +251,8 @@ func (self *handler) update_codepoints() {
 	}
 }
 
+var debugprintln = tty.DebugPrintln
+
 func (self *handler) update_current_char() {
 	self.update_codepoints()
 	self.current_char = InvalidChar
diff --git a/kittens/unicode_input/table.go b/kittens/unicode_input/table.go
index 3661c6a15..f73b3739f 100644
--- a/kittens/unicode_input/table.go
+++ b/kittens/unicode_input/table.go
@@ -194,8 +194,11 @@ func (self *table) layout(rows, cols int) string {
 	}
 	col_width := longest + 2
 	col_width = utils.Min(col_width, 40)
-	space_for_desc = col_width - 2 - idx_size - 4
 	self.num_cols = utils.Max(cols/col_width, 1)
+	if self.num_cols == 1 {
+		col_width = cols
+	}
+	space_for_desc = col_width - 2 - idx_size - 4
 	self.num_rows = rows
 	rows_left := rows
 	skip_scroll := self.scroll_rows * self.num_cols
@@ -207,7 +210,7 @@ func (self *table) layout(rows, cols int) string {
 		}
 		cell(i, cd)
 		output.WriteString("  ")
-		if i > 0 && (i+1)%self.num_cols == 0 {
+		if self.num_cols == 1 || (i > 0 && (i+1)%self.num_cols == 0) {
 			rows_left -= 1
 			if rows_left == 0 {
 				break