Toggle properly toolbar icons that set layout of a paragraph.

Fixes bug #9463.

diff --git a/src/Text3.cpp b/src/Text3.cpp
index 9d6815e37959e2197434f0a1c5f16396609d252b..aeddf4b5546a70201d93dc32269b0739bd76392d 100644 (file)
--- 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") {