[LyX/2.3.x] Fix for bug #11926
Richard Kimberly Heck
rikiheck at lyx.org
Sun Aug 9 17:19:01 UTC 2020
commit e0840677e3369c529017cc355678fbae1e84b5c7
Author: Daniel Ramoeller <d.lyx at web.de>
Date: Fri Aug 7 16:13:48 2020 +0200
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)
---
src/frontends/qt4/GuiCharacter.cpp | 16 ++++++++--------
status.23x | 2 ++
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/frontends/qt4/GuiCharacter.cpp b/src/frontends/qt4/GuiCharacter.cpp
index 71eb61f..25a5db0 100644
--- 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 81b5dd7..eb20622 100644
--- 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.
More information about the lyx-cvs
mailing list