From a6e3c59b94589c9043cd55ceaa3700849b4484dc Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Sun, 16 Dec 2018 12:29:15 +0100 Subject: [PATCH] Use current_font, not real_current_font, in character dialog The latter has the workarea font settings, which are not of interest here. Fixes: #11385 (cherry picked from commit 9705b8825172ff1158b7c1451eb1c0da214808a1) --- src/frontends/qt4/GuiCharacter.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/frontends/qt4/GuiCharacter.cpp b/src/frontends/qt4/GuiCharacter.cpp index 51c3ef558e..bfc766792b 100644 --- a/src/frontends/qt4/GuiCharacter.cpp +++ b/src/frontends/qt4/GuiCharacter.cpp @@ -388,7 +388,7 @@ lyx::FontState setMarkupState(Qt::CheckState cs) void GuiCharacter::updateContents() { if (bufferview()->cursor().selection()) { - Font font = bufferview()->cursor().real_current_font; + Font font = bufferview()->cursor().current_font; FontInfo fi = font.fontInfo(); BufferParams const & bp = buffer().masterParams(); @@ -430,7 +430,7 @@ void GuiCharacter::updateContents() } font_ = font; } else - font_ = bufferview()->cursor().real_current_font; + font_ = bufferview()->cursor().current_font; paramsToDialog(font_); }