anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 06:49:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GuiCharacter: Consider default settings for underline, strikeout and language

Browse Source 
(cherry picked from commit bf2bf2eaed)
This commit is contained in:
Juergen Spitzmueller 2018-12-17 10:12:02 +01:00
parent 1a43a14ef5
commit 0dcf78a4ad
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/frontends/qt4/GuiCharacter.cpp
View File

@ -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_);
}