insetcharstyle drawing cosmetics

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

diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C
index 7b31d8e750189fb14a2c8158c69950b3b3845f58..3d16d9a15d3143af022f4e6a2ad8678a2b1a477d 100644 (file)
--- a/src/insets/insetcollapsable.C
+++ b/src/insets/insetcollapsable.C
@@ -55,7 +55,7 @@ InsetCollapsable::InsetCollapsable(BufferParams const & bp,
        : InsetText(bp), label("Label"), status_(status), openinlined_(false)
 {
        setAutoBreakRows(true);
-       setDrawFrame(InsetText::ALWAYS);
+       setDrawFrame(true);
        setFrameColor(LColor::collapsableframe);
        setInsetName("Collapsable");
        setButtonLabel();
@@ -240,12 +240,12 @@ void InsetCollapsable::edit(LCursor & cur, bool left)
 }
 
 
-InsetBase * InsetCollapsable::editXY(LCursor & cur, int x, int y)
+InsetBase * InsetCollapsable::editXY(LCursor & cur, int x, int y) const
 {
-       cur.push(*this);
+       cur.push(const_cast<InsetCollapsable&>(*this));
        //lyxerr << "InsetCollapsable: edit xy" << endl;
        if (status_ == Collapsed) {
-               return this;
+               return const_cast<InsetCollapsable*>(this);
        }
        return InsetText::editXY(cur, x, y);
 }
@@ -254,16 +254,20 @@ InsetBase * InsetCollapsable::editXY(LCursor & cur, int x, int y)
 void InsetCollapsable::priv_dispatch(LCursor & cur, FuncRequest & cmd)
 {
 //     lyxerr << "InsetCollapsable::priv_dispatch (begin): cmd: " << cmd
-//            << "  button y: " << button_dim.y2 
+//            << "  button y: " << button_dim.y2
 //            << "  coll/inline/open: " << status_ << endl;
+
+       lyxerr << "InsetCollapsable::priv_dispatch (begin): cmd: " << cmd
+               << " cur: " << cur << " bvcur: " << cur.bv().cursor() << endl;
+
        switch (cmd.action) {
        case LFUN_MOUSE_PRESS:
                if (status_ == Inlined)
                        InsetText::priv_dispatch(cur, cmd);
                else if (status_ == Open && !hitButton(cmd))
                        InsetText::priv_dispatch(cur, cmd);
-               else 
-                   cur.noUpdate();
+               else
+                 cur.noUpdate();
                break;
 
        case LFUN_MOUSE_MOTION: