[LyX/2.1.x] Toggle properly toolbar icons that set layout of a paragraph.

[Jean-Marc Lasgouttes]

commit 713d83bf3404a258969a6e52698ec54a72df783b
Author: Jean-Marc Lasgouttes <lasgout...@lyx.org>
Date:   Tue Mar 17 16:40:55 2015 +0100

    Toggle properly toolbar icons that set layout of a paragraph.
    
    Fixes bug #9463.

diff --git a/src/Text3.cpp b/src/Text3.cpp
index 508a604..ae4559b 100644
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -2936,9 +2936,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: {
                // FIXME This hardcoding is bad
diff --git a/status.21x b/status.21x
index 6722dc0..417cb3d 100644
--- a/status.21x
+++ b/status.21x
@@ -41,6 +41,9 @@ What's new
 
 * USER INTERFACE
 
+- The icons for Standard, Itemize and Enumerate layouts are now
+  toggled properly (bug 9463).
+
 - support for the math commands  \lvert, \rvert, \lVert, and \rVert (bug 3538).
 
 - Fix some missing symbols in math completer.