From 85bd5428cbed02cab426f0af72da0f8b377a9e8a Mon Sep 17 00:00:00 2001 From: Stephan Witt Date: Sat, 4 Jan 2014 20:37:38 +0100 Subject: [PATCH] back port from trunk: fix Symbols dialog box grid size in case of broken QFontMetrics::maxWidth() --- src/frontends/qt4/GuiSymbols.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/frontends/qt4/GuiSymbols.cpp b/src/frontends/qt4/GuiSymbols.cpp index 95a4f623aa..d029b213f0 100644 --- a/src/frontends/qt4/GuiSymbols.cpp +++ b/src/frontends/qt4/GuiSymbols.cpp @@ -276,11 +276,15 @@ GuiSymbols::GuiSymbols(GuiView & lv) symbolsLW->setViewMode(QListView::IconMode); // increase the display size of the symbols a bit - QFont font= symbolsLW->font(); - int size = font.pointSize() + 3; + QFont font = symbolsLW->font(); + const int size = font.pointSize() + 3; font.setPointSize(size); QFontMetrics fm(font); - symbolsLW->setGridSize(QSize(fm.maxWidth() + 2, fm.height() + 2)); + const int cellHeight = fm.height() + 2; + // FIXME: using at least cellHeight because of + // QFontMetrics::maxWidth() is returning 0 with Qt/Cocoa on Mac OS + const int cellWidth = max(cellHeight, fm.maxWidth() + 2); + symbolsLW->setGridSize(QSize(cellWidth, cellHeight)); symbolsLW->setFont(font); symbolsLW->setModel(model_); } -- 2.39.5