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

Circumvent odd stmary font metrics (part of #9990).

Browse Source 
The stmary font has an unusual large descent that was causing a large
gap between lines in the math delimiter dialog because of the \llbracket
and \rrbracket delimiters. The solution is to force Qt using the same
size for all elements of the QlistWidget widget instead of letting it
compute the size of each element.
This commit is contained in:
Enrico Forestieri 2016-03-13 01:51:15 +01:00
parent 8d088df4df
commit 0430132aa0
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -181,6 +181,11 @@ GuiDelimiter::GuiDelimiter(GuiView & lv)
initMathSymbols(); initMathSymbols();
FontInfo lyxfont;
lyxfont.setFamily(CMR_FAMILY);
QFontMetrics fm(frontend::getFont(lyxfont));
QSize item_size(fm.maxWidth(), fm.height() + 8);
typedef map<char_type, QListWidgetItem *> ListItems; typedef map<char_type, QListWidgetItem *> ListItems;
ListItems list_items; ListItems list_items;
// The last element is the empty one. // The last element is the empty one.
@ -191,11 +196,12 @@ GuiDelimiter::GuiDelimiter(GuiView & lv)
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);
FontInfo lyxfont;
lyxfont.setFamily(ms.fontfamily); lyxfont.setFamily(ms.fontfamily);
QFont font = frontend::getFont(lyxfont); QFont font = frontend::getFont(lyxfont);
lwi->setFont(font); lwi->setFont(font);
lwi->setToolTip(toqstr(delim)); lwi->setToolTip(toqstr(delim));
lwi->setSizeHint(item_size);
lwi->setTextAlignment(Qt::AlignTop);
list_items[ms.unicode] = lwi; list_items[ms.unicode] = lwi;
leftLW->addItem(lwi); leftLW->addItem(lwi);
} }

4
src/frontends/qt4/ui/DelimiterUi.ui
View File

@ -84,7 +84,7 @@
<enum>QListView::Adjust</enum> <enum>QListView::Adjust</enum>
</property> </property>
<property name="spacing" > <property name="spacing" >
<number>0</number> <number>2</number>
</property> </property>
<property name="currentRow" > <property name="currentRow" >
<number>-1</number> <number>-1</number>
@ -123,7 +123,7 @@
<enum>QListView::Adjust</enum> <enum>QListView::Adjust</enum>
</property> </property>
<property name="spacing" > <property name="spacing" >
<number>0</number> <number>2</number>
</property> </property>
</widget> </widget>
</item> </item>