anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 21:21:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix display of math delimiters in delimiter dialog (#5760)

Browse Source 
Exclude win32 from the fix due to #9428.
This commit is contained in:
Juergen Spitzmueller 2015-05-03 13:23:27 +02:00
parent 8932858563
commit ee771408e4
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/frontends/qt4/GuiDelimiter.cpp
View File

@ -188,13 +188,24 @@ GuiDelimiter::GuiDelimiter(GuiView & lv)
for (int i = 0; i < end; ++i) { for (int i = 0; i < end; ++i) {
string const delim = latex_delimiters[i]; string const delim = latex_delimiters[i];
MathSymbol const & ms = mathSymbol(delim); MathSymbol const & ms = mathSymbol(delim);
// Due to a bug in Qt 4 on Windows, we need to use our math symbol font
// on Windows, which results in sub-optimal glyph display (see #5760).
// FIXME: Re-check after Windows has settled to Qt 5.
#if defined(_WIN32)
QString symbol(ms.fontcode? QString symbol(ms.fontcode?
QChar(ms.fontcode) : toqstr(docstring(1, ms.unicode))); QChar(ms.fontcode) : toqstr(docstring(1, ms.unicode)));
QListWidgetItem * lwi = new QListWidgetItem(symbol); QListWidgetItem * lwi = new QListWidgetItem(symbol);
lwi->setToolTip(toqstr(delim));
FontInfo lyxfont; FontInfo lyxfont;
lyxfont.setFamily(ms.fontfamily); lyxfont.setFamily(ms.fontfamily);
lwi->setFont(frontend::getFont(lyxfont)); QFont font = frontend::getFont(lyxfont);
#else
QString symbol(QChar(ms.unicode));
QListWidgetItem * lwi = new QListWidgetItem(symbol);
QFont font = lwi->font();
font.setPointSize(2 * font.pointSize());
#endif
lwi->setFont(font);
lwi->setToolTip(toqstr(delim));
list_items[ms.unicode] = lwi; list_items[ms.unicode] = lwi;
leftLW->addItem(lwi); leftLW->addItem(lwi);
} }
@ -206,8 +217,18 @@ GuiDelimiter::GuiDelimiter(GuiView & lv)
} }
// The last element is the empty one. // The last element is the empty one.
leftLW->addItem(qt_("(None)")); QListWidgetItem * lwi = new QListWidgetItem(qt_("(None)"));
rightLW->addItem(qt_("(None)")); QListWidgetItem * rwi = new QListWidgetItem(qt_("(None)"));
// See above comment.
// FIXME: Re-check after Windows has settled to Qt 5.
#if !defined(_WIN32)
QFont font = lwi->font();
font.setPointSize(2 * font.pointSize());
lwi->setFont(font);
rwi->setFont(font);
#endif
leftLW->addItem(lwi);
rightLW->addItem(rwi);
sizeCO->addItem(qt_("Variable")); sizeCO->addItem(qt_("Variable"));