Final touch on minimalistic branches

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19989 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp
index 3510d4bdaa4dbfef2b0326532e176ba370bb554e..e701da599f796e11392c8e32cebcbbbc8f4e8be4 100644 (file)
--- a/src/insets/InsetBranch.cpp
+++ b/src/insets/InsetBranch.cpp
@@ -102,7 +102,10 @@ void InsetBranch::setButtonLabel()
                        s = _("Undef: ") + s;
                }
        }
-       setLabel(isOpen() ? s : getNewLabel(s) );
+       if (decoration() == Classic)
+               setLabel(isOpen() ? s : getNewLabel(s) );
+       else
+               setLabel(params_.branch + ": " + getNewLabel(s));
 }
 
 

diff --git a/src/insets/InsetERT.cpp b/src/insets/InsetERT.cpp
index 252cefb75ec76efa4468a1301bf682e46d4a708c..a2f602e566004bb0e97e6d071a2557776fd7fc43 100644 (file)
--- a/src/insets/InsetERT.cpp
+++ b/src/insets/InsetERT.cpp
@@ -198,6 +198,15 @@ void InsetERT::doDispatch(Cursor & cur, FuncRequest & cmd)
        //lyxerr << "\nInsetERT::doDispatch (begin): cmd: " << cmd << endl;
        switch (cmd.action) {
 
+       case LFUN_MOUSE_PRESS:
+               if (cmd.button() != mouse_button::button3)
+                       InsetCollapsable::doDispatch(cur, cmd);
+               else
+                       // This makes the cursor leave the
+                       // inset when it collapses on mouse-3
+                       cur.undispatched();
+               break;
+
        case LFUN_QUOTE_INSERT: {
                // We need to bypass the fancy quotes in Text
                FuncRequest f(LFUN_SELF_INSERT, "\"");
@@ -381,7 +390,10 @@ bool InsetERT::getStatus(Cursor & cur, FuncRequest const & cmd,
 void InsetERT::setButtonLabel()
 {
        // FIXME UNICODE
-       setLabel(isOpen() ?  _("ERT") : getNewLabel(_("ERT")));
+       if (decoration() == Classic)
+               setLabel(isOpen() ? _("ERT") : getNewLabel(_("ERT")));
+       else
+               setLabel(getNewLabel(_("ERT")));
 }