From 0dcf78a4ad21b62de6082fdf3feb7c564ebd1dc7 Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Mon, 17 Dec 2018 10:12:02 +0100 Subject: [PATCH] GuiCharacter: Consider default settings for underline, strikeout and language (cherry picked from commit bf2bf2eaedadf39a6398db624c8b6c52099ca31d) --- src/frontends/qt4/GuiCharacter.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/frontends/qt4/GuiCharacter.cpp b/src/frontends/qt4/GuiCharacter.cpp index af9150478a..e2db531e1c 100644 --- a/src/frontends/qt4/GuiCharacter.cpp +++ b/src/frontends/qt4/GuiCharacter.cpp @@ -335,6 +335,9 @@ FontState getBar(FontInfo const & fi) if (fi.underbar() == FONT_IGNORE) return IGNORE; + if (fi.underbar() == FONT_INHERIT) + return INHERIT; + return NONE; } @@ -350,6 +353,9 @@ FontState getStrike(FontInfo const & fi) if (fi.strikeout() == FONT_IGNORE) return IGNORE; + if (fi.strikeout() == FONT_INHERIT) + return INHERIT; + return NONE; } @@ -432,6 +438,10 @@ void GuiCharacter::updateContents() } else font_ = bufferview()->cursor().current_font; + // If we use the buffer language, display "Default" + if (font_.language() == buffer().params().language) + font_.setLanguage(reset_language); + paramsToDialog(font_); }