* src/LyXAction.C: mark goto-clear-bookmark as working without buffer

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

diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C
index e90fd05f51eab5c6b3b378e9965ab331d5665fae..aec1bf69ec0fdc5901a2008e87fd99723f979d08 100644 (file)
--- a/src/insets/insetcollapsable.C
+++ b/src/insets/insetcollapsable.C
@@ -63,6 +63,23 @@ InsetCollapsable::InsetCollapsable
 }
 
 
+InsetCollapsable::InsetCollapsable(InsetCollapsable const & rhs):
+       InsetText(rhs),         
+       labelfont_(rhs.labelfont_),
+       button_dim(rhs.button_dim),
+       topx(rhs.topx),
+       topbaseline(rhs.topbaseline),
+       label(rhs.label),
+       status_(rhs.status_),
+       openinlined_(rhs.openinlined_),
+       autoOpen_(rhs.autoOpen_),
+       textdim_(rhs.textdim_),
+       // the sole purpose of this copy constructor
+       mouse_hover_(false)
+{
+}
+
+
 void InsetCollapsable::write(Buffer const & buf, ostream & os) const
 {
        os << "status ";
@@ -144,7 +161,8 @@ bool InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
                if (status() == Open) {
                        InsetText::metrics(mi, textdim_);
                        // This expression should not contain mi.base.texwidth
-                       openinlined_ = textdim_.wid < 0.5 * mi.base.bv->workWidth();
+                       openinlined_ = !hasFixedWidth() 
+                               && textdim_.wid < 0.5 * mi.base.bv->workWidth();
                        if (openinlined_) {
                                // Correct for button width, and re-fit
                                mi.base.textwidth -= dim.wid;
@@ -288,7 +306,7 @@ void InsetCollapsable::edit(LCursor & cur, bool left)
 InsetBase * InsetCollapsable::editXY(LCursor & cur, int x, int y)
 {
        //lyxerr << "InsetCollapsable: edit xy" << endl;
-       if (status() == Collapsed || button_dim.contains(x, y))
+       if (status() == Collapsed || (button_dim.contains(x, y) && status() != Inlined))
                return this;
        cur.push(*this);
        return InsetText::editXY(cur, x, y);
@@ -302,9 +320,13 @@ void InsetCollapsable::doDispatch(LCursor & cur, FuncRequest & cmd)
 
        switch (cmd.action) {
        case LFUN_MOUSE_PRESS:
-               if (cmd.button() == mouse_button::button1 && hitButton(cmd)) {
+               if (cmd.button() == mouse_button::button1 && hitButton(cmd) && status() != Inlined) {
+                       // reset selection if necessary (see bug 3060)
+                       if (cur.selection())
+                               cur.bv().cursor().clearSelection();
+                       else
+                               cur.noUpdate();
                        cur.dispatched();
-                       cur.noUpdate();
                        break;
                }
                if (status() == Inlined)
@@ -340,8 +362,12 @@ void InsetCollapsable::doDispatch(LCursor & cur, FuncRequest & cmd)
                }
 
                if (cmd.button() == mouse_button::button1 && hitButton(cmd)) {
-                       // Left button is clicked, the user asks to toggle the inset
-                       // visual state.
+                       // if we are selecting, we do not want to
+                       // toggle the inset.
+                       if (cur.selection())
+                               break;
+                       // Left button is clicked, the user asks to
+                       // toggle the inset visual state.
                        cur.dispatched();
                        cur.updateFlags(Update::Force | Update::FitCursor);
                        if (status() == Collapsed) {
@@ -356,7 +382,8 @@ void InsetCollapsable::doDispatch(LCursor & cur, FuncRequest & cmd)
                }
 
                // The mouse click is within the opened inset.
-               InsetText::doDispatch(cur, cmd);
+               if (status() == Open)
+                       InsetText::doDispatch(cur, cmd);
                break;
 
        case LFUN_INSET_TOGGLE: