Le 20/11/2012 23:39, Jean-Marc Lasgouttes a écrit :
commit 7ec2721d188edb777e4a64ae6005ca1d9d77f77a
Author: Jean-Marc Lasgouttes <lasgout...@lyx.org>
Date:   Tue Nov 20 23:38:38 2012 +0100

     Show status of branches even when inset is closed

If nobody complains about it, this is candidate for branch.

JMarc


diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp
index db047c2..efdeea5 100644
--- a/src/insets/InsetBranch.cpp
+++ b/src/insets/InsetBranch.cpp
@@ -106,11 +106,10 @@ docstring const InsetBranch::buttonLabel(BufferView const 
& bv) const
        docstring symb = docstring(1, char_type(master_selected ? 0x2714 : 
0x2716));
        if (inchild && master_selected != child_selected)
                symb += char_type(child_selected ? 0x2714 : 0x2716);
-       s = symb + s;
        if (decoration() == InsetLayout::CLASSIC)
-               return isOpen(bv) ? s : getNewLabel(s);
+               return symb + (isOpen(bv) ? s : getNewLabel(s));
        else
-               return params_.branch + ": " + getNewLabel(s);
+               return symb + params_.branch + ": " + getNewLabel(s);
  }



-----------------------------------------------------------------------

Summary of changes:
  src/insets/InsetBranch.cpp |    5 ++---
  1 files changed, 2 insertions(+), 3 deletions(-)


hooks/post-receive


Reply via email to