From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Tue, 17 Mar 2015 15:40:55 +0000 (+0100)
Subject: Toggle properly toolbar icons that set layout of a paragraph.
X-Git-Tag: 2.2.0alpha1~1145
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=ba0b8470401339567352532e850e2a6d484a6c6e;p=features.git

Toggle properly toolbar icons that set layout of a paragraph.

Fixes bug #9463.
---

diff --git a/src/Text3.cpp b/src/Text3.cpp
index 9d6815e379..aeddf4b554 100644
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -3014,9 +3014,17 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 		enable = theSpellChecker();
 		break;
 
-	case LFUN_LAYOUT:
+	case LFUN_LAYOUT: {
 		enable = !cur.inset().forcePlainLayout();
+
+		docstring layout = cmd.argument();
+		if (layout.empty()) {
+			DocumentClass const & tclass = cur.buffer()->params().documentClass();
+			layout = tclass.defaultLayoutName();
+		}
+		flag.setOnOff(layout == cur.paragraph().layout().name());
 		break;
+	}
 
 	case LFUN_ENVIRONMENT_SPLIT: {
 		if (cmd.argument() == "outer") {