From eae4dd831289bc36fc2a6a67e6f46b6185f51620 Mon Sep 17 00:00:00 2001 From: mjbudd77 Date: Mon, 17 May 2021 21:16:56 -0400 Subject: [PATCH] Added a minimum column pixel width to ensure that at least 6 characters can be displayed on name table viewer text fields. --- src/drivers/Qt/NameTableViewer.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/drivers/Qt/NameTableViewer.cpp b/src/drivers/Qt/NameTableViewer.cpp index caa2305e..cb6a9690 100644 --- a/src/drivers/Qt/NameTableViewer.cpp +++ b/src/drivers/Qt/NameTableViewer.cpp @@ -144,12 +144,19 @@ ppuNameTableViewerDialog_t::ppuNameTableViewerDialog_t(QWidget *parent) QLabel *lbl; QFont font; //char stmp[64]; - int useNativeMenuBar; + int useNativeMenuBar, pxCharWidth; font.setFamily("Courier New"); font.setStyle( QFont::StyleNormal ); font.setStyleHint( QFont::Monospace ); + QFontMetrics metrics(font); +#if QT_VERSION > QT_VERSION_CHECK(5, 11, 0) + pxCharWidth = metrics.horizontalAdvance(QLatin1Char('2')); +#else + pxCharWidth = metrics.width(QLatin1Char('2')); +#endif + nameTableViewWindow = this; menuBar = new QMenuBar(this); @@ -424,6 +431,8 @@ ppuNameTableViewerDialog_t::ppuNameTableViewerDialog_t(QWidget *parent) lbl->setFont( font ); grid->addWidget( lbl, 7, 0, Qt::AlignLeft ); + grid->setColumnMinimumWidth( 1, pxCharWidth * 6 ); + ppuAddrLbl = new QLineEdit(); ppuAddrLbl->setReadOnly(true); grid->addWidget( ppuAddrLbl, 0, 1, Qt::AlignLeft );