commit 262b0dcca468933e685765767efb391e991e325f
Author: Juergen Spitzmueller <[email protected]>
Date: Mon Dec 17 10:37:14 2018 +0100
GuiCharacter: INHERIT is OFF for the tristate buttons.
(cherry picked from commit 1b6ce0e827d58258e84ba2bf0754c6b273b123db)
---
src/frontends/qt4/GuiCharacter.cpp | 2 +-
status.23x | 2 ++
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/frontends/qt4/GuiCharacter.cpp
b/src/frontends/qt4/GuiCharacter.cpp
index e2db531..9a865ce 100644
--- a/src/frontends/qt4/GuiCharacter.cpp
+++ b/src/frontends/qt4/GuiCharacter.cpp
@@ -363,12 +363,12 @@ FontState getStrike(FontInfo const & fi)
Qt::CheckState getMarkupState(lyx::FontState fs)
{
switch (fs) {
+ case FONT_INHERIT:
case FONT_OFF:
return Qt::Unchecked;
case FONT_ON:
return Qt::Checked;
case FONT_TOGGLE:
- case FONT_INHERIT:
case FONT_IGNORE:
default:
return Qt::PartiallyChecked;
diff --git a/status.23x b/status.23x
index 97a9a3c..fe431d3 100644
--- a/status.23x
+++ b/status.23x
@@ -67,6 +67,8 @@ What's new
- Fix undo in some cases involving nesting (bug 11292).
+- Fix some display problems in the Text Properties dialog (bug 11385).
+
* INTERNALS
