From 08249963b24a6754eae45e75cad9658bd9eccbfd Mon Sep 17 00:00:00 2001
From: PatR <rankin@nethack.org>
Date: Sun, 2 Aug 2020 15:03:27 -0700
Subject: [PATCH] Qt menu fix

The change to use fixed-width fonts for menus wasn't working
optimally because the font got changed after menu construction
had measured the necessary width and height amounts.  ^X output,
which uses a menu instead of a text window for tty's benefit
(probably curses too; I don't remember), had a couple of lines
which were wrapping unnecessarily.

This fix avoids that, but the extra '+20' shouldn't be needed.
Unfortunately lines in menus are effectively double-spaced, which
looks bad, and I've no idea how to fix that.
---
 win/Qt/qt_menu.cpp | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/win/Qt/qt_menu.cpp b/win/Qt/qt_menu.cpp
index 2f4d41762..aad4d5885 100644
--- a/win/Qt/qt_menu.cpp
+++ b/win/Qt/qt_menu.cpp
@@ -91,6 +91,11 @@ NetHackQtMenuWindow::NetHackQtMenuWindow(QWidget *parent) :
     prompt(0),
     counting(false)
 {
+    // setFont() was in SelectMenu(), in time to be rendered but too late
+    // when measuring the width and height that will be needed
+    QFont tablefont(qt_settings->normalFixedFont());
+    table->setFont(tablefont);
+
     QGridLayout *grid = new QGridLayout();
     table->setColumnCount(5);
     table->setFrameStyle(QFrame::Panel|QFrame::Sunken);
@@ -134,7 +139,8 @@ NetHackQtMenuWindow::NetHackQtMenuWindow(QWidget *parent) :
     grid->setRowStretch(2, 1);
     setFocusPolicy(Qt::StrongFocus);
     table->setFocusPolicy(Qt::NoFocus);
-    connect(table, SIGNAL(cellClicked(int,int)), this, SLOT(cellToggleSelect(int,int)));
+    connect(table, SIGNAL(cellClicked(int,int)),
+            this, SLOT(cellToggleSelect(int,int)));
 
     setLayout(grid);
 }
@@ -214,9 +220,6 @@ void NetHackQtMenuWindow::EndMenu(const QString& p)
 
 int NetHackQtMenuWindow::SelectMenu(int h, MENU_ITEM_P **menu_list)
 {
-    QFont tablefont(qt_settings->normalFixedFont());
-    table->setFont(tablefont);
-
     table->setRowCount(itemcount);
 
     how=h;
@@ -243,10 +246,18 @@ int NetHackQtMenuWindow::SelectMenu(int h, MENU_ITEM_P **menu_list)
     std::vector<int> col_widths;
     for (std::size_t i = 0; i < (size_t) itemlist.size(); ++i) {
 	QStringList columns = itemlist[i].str.split("\t");
-        if (!itemlist[i].Selectable() && columns.size() == 1)
-        {
-            // Nonselectable line with no column dividers
+        if (!itemlist[i].Selectable() && columns.size() == 1) {
+            // Nonselectable line with no column dividers.
             // Assume this is a section header
+            // or ordinary text (^X feedback, for instance) rendered in
+            // a menu because tty's paginated menus can be used to go
+            // backward, unlike text windows which can only go forward.
+            QTableWidgetItem *twi = table->item(i, 4);
+            if (twi) {
+                QString text = twi->text();
+#define MENU_WIDTH_SLOP 20 /* this should not be necessary */
+                WidenColumn(4, fm.width(text) + MENU_WIDTH_SLOP);
+            }
             continue;
         }
 	for (std::size_t j = 0U; j < (size_t) columns.size(); ++j) {