]> git.lyx.org Git - features.git/commitdiff
Use current_font, not real_current_font, in character dialog
authorJuergen Spitzmueller <spitz@lyx.org>
Sun, 16 Dec 2018 11:29:15 +0000 (12:29 +0100)
committerJuergen Spitzmueller <spitz@lyx.org>
Mon, 17 Dec 2018 09:41:03 +0000 (10:41 +0100)
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

index 51c3ef558ec6747c26e6b43ffb093b831bfe6550..bfc766792b97d45dc9b538402008097e9ea522e5 100644 (file)
@@ -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_);
 }