commit b0db575dc1bcd08efb5b1289204326a3391de798
Author: Yuriy Skalko <[email protected]>
Date:   Mon Aug 31 10:29:14 2020 +0300

    Show custom text styles in status bar
    
    Fixes bug #11951.
---
 src/Text.cpp |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Text.cpp b/src/Text.cpp
index 575eea6..8f39183 100644
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -1991,7 +1991,7 @@ bool Text::read(Lexer & lex,
 }
 
 
-// Returns the current font and depth as a message.
+// Returns the current state (font, depth etc.) as a message for status bar.
 docstring Text::currentState(CursorData const & cur, bool devel_mode) const
 {
        LBUFERR(this == cur.text());
@@ -2021,7 +2021,7 @@ docstring Text::currentState(CursorData const & cur, bool 
devel_mode) const
        os << bformat(_("Font: %1$s"), font.stateText(&buf.params()));
 
        // The paragraph depth
-       int depth = cur.paragraph().getDepth();
+       int depth = par.getDepth();
        if (depth > 0)
                os << bformat(_(", Depth: %1$d"), depth);
 
@@ -2049,6 +2049,11 @@ docstring Text::currentState(CursorData const & cur, 
bool devel_mode) const
                }
        }
 
+       // Custom text style
+       InsetLayout const & layout = cur.inset().getLayout();
+       if (layout.lyxtype() == InsetLayout::CHARSTYLE)
+               os << _(", Style: ") << 
translateIfPossible(layout.labelstring());
+
        if (devel_mode) {
                os << _(", Inset: ") << &cur.inset();
                if (cur.lastidx() > 0)
-- 
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs

Reply via email to