hopefully fix tex2lyx linking.

[lyx.git] / src / insets / insetcollapsable.C

diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C
index 7d95df18c7e7883f10ecef7d876e6400dc993cc6..3d4434aa79e138ec868fac88b959d75115e279f8 100644 (file)
--- a/src/insets/insetcollapsable.C
+++ b/src/insets/insetcollapsable.C
@@ -126,9 +126,8 @@ void InsetCollapsable::read(Buffer const & buf, LyXLex & lex)
 Dimension InsetCollapsable::dimensionCollapsed() const
 {
        Dimension dim;
-       docstring dlab(label.begin(), label.end());
        theFontMetrics(labelfont_).buttonText(
-               dlab, dim.wid, dim.asc, dim.des);
+               label, dim.wid, dim.asc, dim.des);
        return dim;
 }
 
@@ -180,8 +179,7 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
                button_dim.y1 = top;
                button_dim.y2 = top + dimc.height();
 
-                docstring dlab(label.begin(), label.end());
-               pi.pain.buttonText(xx, top + dimc.asc, dlab, labelfont_);
+               pi.pain.buttonText(xx, top + dimc.asc, label, labelfont_);
 
                if (status() == Open) {
                        int textx, texty;
@@ -295,6 +293,11 @@ void InsetCollapsable::doDispatch(LCursor & cur, FuncRequest & cmd)
 
        switch (cmd.action) {
        case LFUN_MOUSE_PRESS:
+               if (cmd.button() == mouse_button::button1 && hitButton(cmd)) {
+                       cur.dispatched();
+                       cur.noUpdate();
+                       break;
+               }
                if (status() == Inlined)
                        InsetText::doDispatch(cur, cmd);
                else if (status() == Open && !hitButton(cmd))
@@ -316,36 +319,35 @@ void InsetCollapsable::doDispatch(LCursor & cur, FuncRequest & cmd)
 
        case LFUN_MOUSE_RELEASE:
                if (cmd.button() == mouse_button::button3) {
+                       // Open the Inset configuration dialog
                        showInsetDialog(&cur.bv());
                        break;
                }
 
-               switch (status()) {
-
-               case Collapsed:
-                       //lyxerr << "InsetCollapsable::lfunMouseRelease 1" << endl;
-                       setStatus(cur, Open);
-                       edit(cur, true);
-                       cur.bv().cursor() = cur;
+               if (status() == Inlined) {
+                       // The mouse click has to be within the inset!
+                       InsetText::doDispatch(cur, cmd);
                        break;
+               }
 
-               case Open: {
-                       if (hitButton(cmd)) {
-                               //lyxerr << "InsetCollapsable::lfunMouseRelease 2" << endl;
+               if (cmd.button() == mouse_button::button1 && hitButton(cmd)) {
+                       // Left button is clicked, the user asks to toggle the inset
+                       // visual state.
+                       cur.dispatched();
+                       cur.updateFlags(Update::Force | Update::FitCursor);
+                       if (status() == Collapsed) {
+                               setStatus(cur, Open);
+                               edit(cur, true);
+                       }
+                       else {
                                setStatus(cur, Collapsed);
-                               cur.bv().cursor() = cur;
-                       } else {
-                               //lyxerr << "InsetCollapsable::lfunMouseRelease 3" << endl;
-                               InsetText::doDispatch(cur, cmd);
                        }
+                       cur.bv().cursor() = cur;
                        break;
                }
 
-               case Inlined:
-                       //lyxerr << "InsetCollapsable::lfunMouseRelease 4" << endl;
-                       InsetText::doDispatch(cur, cmd);
-                       break;
-               }
+               // The mouse click is within the opened inset.
+               InsetText::doDispatch(cur, cmd);
                break;
 
        case LFUN_INSET_TOGGLE: