commit 2109412720046ab57d4873c7706c2c15e61d65f2
Author: Jean-Marc Lasgouttes <[email protected]>
Date:   Fri Jul 17 16:13:34 2015 +0200

    Reset cursor font when entring an inset with char-forward/backward
    
    When entering an inset from the keyboard, setCurrentFont()
    was not called and thus the cursor retained the font that was set
    before. This could create strange behavior that could often go
    unnoticed by the user.
    
    It is easy to imagine many other situations similar to #9597 where
    the user could trigger this bug.
    
    Fixes bug #9597.

diff --git a/src/Text2.cpp b/src/Text2.cpp
index 5f4ca2f..8adc02c 100644
--- a/src/Text2.cpp
+++ b/src/Text2.cpp
@@ -616,6 +616,7 @@ bool Text::checkAndActivateInset(Cursor & cur, bool front)
        if (!front)
                --cur.pos();
        inset->edit(cur, front);
+       cur.setCurrentFont();
        return true;
 }
 
@@ -634,6 +635,7 @@ bool Text::checkAndActivateInsetVisual(Cursor & cur, bool 
movingForward, bool mo
                return false;
        inset->edit(cur, movingForward, 
                movingLeft ? Inset::ENTRY_DIRECTION_RIGHT : 
Inset::ENTRY_DIRECTION_LEFT);
+       cur.setCurrentFont();
        return true;
 }
 
diff --git a/status.21x b/status.21x
index b1b724d..38387e4 100644
--- a/status.21x
+++ b/status.21x
@@ -184,6 +184,9 @@ What's new
 
 - Fix cursor font after undoing a font-changing command (bug 9537).
 
+- Reset cursor font when entring an inset with char-forward/backward
+  (bug 9597).
+
 - Fix crash when attempting to restore a document with multiple views on the
   Mac (bug 9483).
 

Reply via email to