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

Improve usability of quotation mark selection (#12872)

Browse Source
This commit is contained in:
Juergen Spitzmueller 2023-08-15 20:21:32 +02:00
parent 5ebf9e3ac6
commit 71693280c3
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/frontends/qt/GuiDocument.cpp
View File

@ -2424,6 +2424,25 @@ void GuiDocument::updateQuoteStyles(bool const set)
langModule->quoteStyleCO->addItem(
toqstr(quoteparams.getGuiLabel(qs, langdef)), static_cast<int>(qs));
}
// Use document serif font to assure quotation marks are distinguishable
QFont comboFont(toqstr(lyxrc.roman_font_name),
langModule->quoteStyleCO->fontInfo().pointSize() * 1.4, -1, false);
QFontMetrics fm(comboFont);
// calculate width of the widest item in the set font
int qswidth = 0;
for (int i = 0; i < langModule->quoteStyleCO->count(); ++i) {
langModule->quoteStyleCO->setItemData(i, QVariant(comboFont), Qt::FontRole);
QString str = langModule->quoteStyleCO->itemText(i);
#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
qswidth = max(qswidth, fm.horizontalAdvance(str));
#else
qswidth = max(qswidth, fm.width(str));
#endif
}
// add scrollbar width and margin to width
qswidth += langModule->quoteStyleCO->style()->pixelMetric(QStyle::PM_ScrollBarExtent);
qswidth += langModule->quoteStyleCO->view()->autoScrollMargin();
langModule->quoteStyleCO->view()->setMinimumWidth(qswidth);
if (set && has_default)
// (re)set to the default style
langModule->quoteStyleCO->setCurrentIndex(0);