From b8969d2e9c380dc8bcb1e452e575eca47c279b0a Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Tue, 14 Jul 2020 15:49:15 +0200 Subject: [PATCH] Reset CategorizedCombo filter when switching between non-TeX and TeX fonts --- src/frontends/qt/CategorizedCombo.cpp | 5 +++++ src/frontends/qt/CategorizedCombo.h | 2 ++ src/frontends/qt/GuiDocument.cpp | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/src/frontends/qt/CategorizedCombo.cpp b/src/frontends/qt/CategorizedCombo.cpp index 3460a1417a..f8e8ef6b91 100644 --- a/src/frontends/qt/CategorizedCombo.cpp +++ b/src/frontends/qt/CategorizedCombo.cpp @@ -539,6 +539,11 @@ void CategorizedCombo::reset() d->model_->clear(); } +void CategorizedCombo::resetFilter() +{ + d->resetFilter(); +} + void CategorizedCombo::updateCombo() { diff --git a/src/frontends/qt/CategorizedCombo.h b/src/frontends/qt/CategorizedCombo.h index a9a200a5cf..3ce7da7883 100644 --- a/src/frontends/qt/CategorizedCombo.h +++ b/src/frontends/qt/CategorizedCombo.h @@ -41,6 +41,8 @@ public: bool set(QString const & cc); /// Reset the combobox. void reset(); + /// Reset the combobox filter. + void resetFilter(); /// Update combobox. void updateCombo(); /// Add Item to combo according to sorting settings from preferences diff --git a/src/frontends/qt/GuiDocument.cpp b/src/frontends/qt/GuiDocument.cpp index 269985caeb..a82fc1765c 100644 --- a/src/frontends/qt/GuiDocument.cpp +++ b/src/frontends/qt/GuiDocument.cpp @@ -2333,6 +2333,7 @@ void GuiDocument::osFontsChanged(bool nontexfonts) int const font_sf_scale = fontModule->scaleSansSB->value(); int const font_tt_scale = fontModule->scaleTypewriterSB->value(); + // reset the filters updateFontlist(); // store default format QString const dformat = outputModule->defaultFormatCO->itemData( @@ -2599,6 +2600,9 @@ void GuiDocument::updateTexFonts() void GuiDocument::updateFontlist() { + fontModule->fontsRomanCO->resetFilter(); + fontModule->fontsSansCO->resetFilter(); + fontModule->fontsTypewriterCO->resetFilter(); fontModule->fontsRomanCO->clear(); fontModule->fontsSansCO->clear(); fontModule->fontsTypewriterCO->clear(); -- 2.39.5