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

diff --git a/src/frontends/qt/CategorizedCombo.cpp b/src/frontends/qt/CategorizedCombo.cpp
index 3460a1417a4874a5082e919abb4946ef697171fb..f8e8ef6b914a9135822187d7fccd5e50837a93f1 100644 (file)
--- 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 a9a200a5cf5f19e5c61afabd36f6d48db34c3548..3ce7da78830d3f49d0dcdd6573dc43da6d59b100 100644 (file)
--- 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 269985caeb8eb24d308691bfa173517ff3c2cdf3..a82fc1765c0e2edd71b07d267c14045d84ce3b8c 100644 (file)
--- 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();