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

Reset CategorizedCombo filter when switching between non-TeX and TeX fonts

Browse Source
This commit is contained in:
Juergen Spitzmueller 2020-07-14 15:49:15 +02:00
parent 61cf165521
commit b8969d2e9c
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/frontends/qt/CategorizedCombo.cpp
View File

@ -539,6 +539,11 @@ void CategorizedCombo::reset()
d->model_->clear(); d->model_->clear();
} }
void CategorizedCombo::resetFilter()
{
d->resetFilter();
}
void CategorizedCombo::updateCombo() void CategorizedCombo::updateCombo()
{ {

2
src/frontends/qt/CategorizedCombo.h
View File

@ -41,6 +41,8 @@ public:
bool set(QString const & cc); bool set(QString const & cc);
/// Reset the combobox. /// Reset the combobox.
void reset(); void reset();
/// Reset the combobox filter.
void resetFilter();
/// Update combobox. /// Update combobox.
void updateCombo(); void updateCombo();
/// Add Item to combo according to sorting settings from preferences /// Add Item to combo according to sorting settings from preferences

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

@ -2333,6 +2333,7 @@ void GuiDocument::osFontsChanged(bool nontexfonts)
int const font_sf_scale = fontModule->scaleSansSB->value(); int const font_sf_scale = fontModule->scaleSansSB->value();
int const font_tt_scale = fontModule->scaleTypewriterSB->value(); int const font_tt_scale = fontModule->scaleTypewriterSB->value();
// reset the filters
updateFontlist(); updateFontlist();
// store default format // store default format
QString const dformat = outputModule->defaultFormatCO->itemData( QString const dformat = outputModule->defaultFormatCO->itemData(
@ -2599,6 +2600,9 @@ void GuiDocument::updateTexFonts()
void GuiDocument::updateFontlist() void GuiDocument::updateFontlist()
{ {
fontModule->fontsRomanCO->resetFilter();
fontModule->fontsSansCO->resetFilter();
fontModule->fontsTypewriterCO->resetFilter();
fontModule->fontsRomanCO->clear(); fontModule->fontsRomanCO->clear();
fontModule->fontsSansCO->clear(); fontModule->fontsSansCO->clear();
fontModule->fontsTypewriterCO->clear(); fontModule->fontsTypewriterCO->clear();