nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Qt menu fix

Browse Source 
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.
This commit is contained in:
PatR
2020-08-02 15:03:27 -07:00
parent 357cb198ee
commit 08249963b2
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
win/Qt/qt_menu.cpp
View File

@@ -91,6 +91,11 @@ NetHackQtMenuWindow::NetHackQtMenuWindow(QWidget *parent) :
prompt(0), prompt(0),
counting(false) 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(); QGridLayout *grid = new QGridLayout();
table->setColumnCount(5); table->setColumnCount(5);
table->setFrameStyle(QFrame::Panel|QFrame::Sunken); table->setFrameStyle(QFrame::Panel|QFrame::Sunken);
@@ -134,7 +139,8 @@ NetHackQtMenuWindow::NetHackQtMenuWindow(QWidget *parent) :
grid->setRowStretch(2, 1); grid->setRowStretch(2, 1);
setFocusPolicy(Qt::StrongFocus); setFocusPolicy(Qt::StrongFocus);
table->setFocusPolicy(Qt::NoFocus); 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); setLayout(grid);
} }
@@ -214,9 +220,6 @@ void NetHackQtMenuWindow::EndMenu(const QString& p)
int NetHackQtMenuWindow::SelectMenu(int h, MENU_ITEM_P **menu_list) int NetHackQtMenuWindow::SelectMenu(int h, MENU_ITEM_P **menu_list)
{ {
QFont tablefont(qt_settings->normalFixedFont());
table->setFont(tablefont);
table->setRowCount(itemcount); table->setRowCount(itemcount);
how=h; how=h;
@@ -243,10 +246,18 @@ int NetHackQtMenuWindow::SelectMenu(int h, MENU_ITEM_P **menu_list)
std::vector<int> col_widths; std::vector<int> col_widths;
for (std::size_t i = 0; i < (size_t) itemlist.size(); ++i) { for (std::size_t i = 0; i < (size_t) itemlist.size(); ++i) {
QStringList columns = itemlist[i].str.split("\t"); QStringList columns = itemlist[i].str.split("\t");
if (!itemlist[i].Selectable() && columns.size() == 1) if (!itemlist[i].Selectable() && columns.size() == 1) {
{ // Nonselectable line with no column dividers.
// Nonselectable line with no column dividers
// Assume this is a section header // 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; continue;
} }
for (std::size_t j = 0U; j < (size_t) columns.size(); ++j) { for (std::size_t j = 0U; j < (size_t) columns.size(); ++j) {