commit 195f307a3904450152bcf24b31cf96067c4a5feb
Author: Yuriy Skalko <[email protected]>
Date: Mon Aug 31 10:29:14 2020 +0300
Show custom text styles in status bar
Fixes bug #11951.
(cherry picked from commit b0db575dc1bcd08efb5b1289204326a3391de798)
---
src/Text.cpp | 9 +++++++--
status.23x | 2 ++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/Text.cpp b/src/Text.cpp
index 0c27d51..8337e6d 100644
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -1898,7 +1898,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(Cursor const & cur, bool devel_mode) const
{
LBUFERR(this == cur.text());
@@ -1928,7 +1928,7 @@ docstring Text::currentState(Cursor 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);
@@ -1956,6 +1956,11 @@ docstring Text::currentState(Cursor 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();
os << _(", Paragraph: ") << cur.pit();
diff --git a/status.23x b/status.23x
index 295286c..57da79c 100644
--- a/status.23x
+++ b/status.23x
@@ -37,6 +37,8 @@ What's new
- Update autocorrect in mathed so that pressing '*' after a delimiter will
cycle through all sizes.
+- Display character styles along with fonts in status bar (bug 11951).
+
* MISCELLANEOUS
--
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs
