Fix for bug #11926

Change comobox signal to user interaction only to avoid problems with "Apply changes immediately" aka "Immediate Apply". (See https://doc.qt.io/qt-5/qcombobox.html#currentIndexChanged and https://doc.qt.io/qt-5/qcombobox.html#activated.)

(cherry picked from commit d3a04c089b5e7345a6d5557dd99392a42cc0b83a)

diff --git a/src/frontends/qt4/GuiCharacter.cpp b/src/frontends/qt4/GuiCharacter.cpp
index 71eb61fa1807d81d27df46c7f2bc0e77bb1f8bed..25a5db0109d0b0eaba34bd99f97eba2b6a544b73 100644 (file)
--- a/src/frontends/qt4/GuiCharacter.cpp
+++ b/src/frontends/qt4/GuiCharacter.cpp
@@ -218,14 +218,14 @@ GuiCharacter::GuiCharacter(GuiView & lv)
        connect(autoapplyCB, SIGNAL(stateChanged(int)), this,
                SLOT(slotAutoApply()));
 
-       connect(ulineCO, SIGNAL(currentIndexChanged(int)), this, SLOT(change_adaptor()));
-       connect(strikeCO, SIGNAL(currentIndexChanged(int)), this, SLOT(change_adaptor()));
-       connect(sizeCO, SIGNAL(currentIndexChanged(int)), this, SLOT(change_adaptor()));
-       connect(familyCO, SIGNAL(currentIndexChanged(int)), this, SLOT(change_adaptor()));
-       connect(seriesCO, SIGNAL(currentIndexChanged(int)), this, SLOT(change_adaptor()));
-       connect(shapeCO, SIGNAL(currentIndexChanged(int)), this, SLOT(change_adaptor()));
-       connect(colorCO, SIGNAL(currentIndexChanged(int)), this, SLOT(change_adaptor()));
-       connect(langCO, SIGNAL(currentIndexChanged(int)), this, SLOT(change_adaptor()));
+       connect(ulineCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+       connect(strikeCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+       connect(sizeCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+       connect(familyCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+       connect(seriesCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+       connect(shapeCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+       connect(colorCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+       connect(langCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
 
        family = familyData();
        series = seriesData();

diff --git a/status.23x b/status.23x
index 81b5dd7573cbfc55585164474cdf1e6cfd0fb2c0..eb206222b4c661848d11c0e5f27d010e68183ef5 100644 (file)
--- a/status.23x
+++ b/status.23x
@@ -26,6 +26,8 @@ What's new
 
 - Add support for the doublestroke package in mathed (bug 11887).
 
+- Fix behavior of text style dialog when "Immediate Apply" is checked (bug 11926).
+
 - Focus keyword field in Thesaurus dialog.