From: Stephan Witt <switt@lyx.org>
Date: Sat, 4 Jan 2014 19:37:38 +0000 (+0100)
Subject: back port from trunk:
X-Git-Tag: 2.0.7~4
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=85bd5428cbed02cab426f0af72da0f8b377a9e8a;p=features.git

back port from trunk:
fix Symbols dialog box grid size in case of broken QFontMetrics::maxWidth()
---

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_);
 }