]> git.lyx.org Git - lyx.git/blobdiff - src/insets/insetcollapsable.C
The speed patch: redraw only rows that have changed
[lyx.git] / src / insets / insetcollapsable.C
index 633b1d60ec1952103e97bffb3c2f103838c54c0e..7d39be20b645f692aa720113a0470bfc59750fea 100644 (file)
@@ -19,6 +19,7 @@
 #include "cursor.h"
 #include "debug.h"
 #include "dispatchresult.h"
+#include "FuncStatus.h"
 #include "LColor.h"
 #include "lyxlex.h"
 #include "funcrequest.h"
@@ -39,20 +40,16 @@ using std::min;
 using std::ostream;
 
 
-void leaveInset(LCursor & cur, InsetBase const & in)
+InsetCollapsable::CollapseStatus InsetCollapsable::status() const
 {
-       for (unsigned int i = 0; i != cur.size(); ++i) {
-               if (&cur[i].inset() == &in) {
-                       cur.resize(i);
-                       return;
-               }
-       }
+       return (autoOpen_ && status_ != Inlined) ? Open : status_;
 }
 
 
-InsetCollapsable::InsetCollapsable(BufferParams const & bp,
-       CollapseStatus status)
-       : InsetText(bp), label("Label"), status_(status), openinlined_(false)
+InsetCollapsable::InsetCollapsable
+               (BufferParams const & bp, CollapseStatus status)
+       : InsetText(bp), label("Label"), status_(status),
+         openinlined_(false), autoOpen_(false)
 {
        setAutoBreakRows(true);
        setDrawFrame(true);
@@ -122,26 +119,33 @@ void InsetCollapsable::read(Buffer const & buf, LyXLex & lex)
 }
 
 
-void InsetCollapsable::dimension_collapsed(Dimension & dim) const
+Dimension InsetCollapsable::dimensionCollapsed() const
 {
+       Dimension dim;
        font_metrics::buttonText(label, labelfont_, dim.wid, dim.asc, dim.des);
+       return dim;
 }
 
 
 void InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
 {
+       autoOpen_ = mi.base.bv->cursor().isInside(this);
        mi.base.textwidth -= 2 * TEXT_TO_INSET_OFFSET;
-       if (status_ == Inlined) {
+
+       if (status() == Inlined) {
                InsetText::metrics(mi, dim);
        } else {
-               dimension_collapsed(dim);
-               if (status_ == Open) {
+               dim = dimensionCollapsed();
+               if (status() == Open) {
                        InsetText::metrics(mi, textdim_);
+                       bool oldopeninlined = openinlined_;
                        openinlined_ = (textdim_.wid + dim.wid <= mi.base.textwidth);
+                       if (openinlined_ != oldopeninlined)
+                               InsetText::metrics(mi, textdim_);
                        if (openinlined_) {
                                dim.wid += textdim_.wid;
-                               dim.des = max(dim.des, textdim_.des);
-                               dim.asc = max(dim.asc, textdim_.asc);
+                               dim.des = max(dim.des - textdim_.asc + dim.asc, textdim_.des);
+                               dim.asc = textdim_.asc;
                        } else {
                                dim.des += textdim_.height() + TEXT_TO_BOTTOM_OFFSET;
                                dim.wid = max(dim.wid, textdim_.wid);
@@ -156,55 +160,81 @@ void InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
 }
 
 
-void InsetCollapsable::draw_collapsed(PainterInfo & pi, int x, int y) const
+void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
 {
-       pi.pain.buttonText(x, y, label, labelfont_);
+       const int xx = x + TEXT_TO_INSET_OFFSET;
+       if (status() == Inlined) {
+               InsetText::draw(pi, xx, y);
+       } else {
+               Dimension dimc = dimensionCollapsed();
+               int const top  = y - ascent() + TEXT_TO_INSET_OFFSET;
+               button_dim.x1 = xx + 0;
+               button_dim.x2 = xx + dimc.width();
+               button_dim.y1 = top;
+               button_dim.y2 = top + dimc.height();
+
+               pi.pain.buttonText(xx, top + dimc.asc, label, labelfont_);
+               if (status() == Open) {
+                       int textx, texty;
+                       if (openinlined_) {
+                               textx = xx + dimc.width();
+                               texty = top + textdim_.asc;
+                       } else {
+                               textx = xx;
+                               texty = top + dimc.height() + textdim_.asc;
+                       }
+                       InsetText::draw(pi, textx, texty);
+               }
+       }
+       setPosCache(pi, x, y);
 }
 
 
-void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
+void InsetCollapsable::drawSelection(PainterInfo & pi, int x, int y) const
 {
        x += TEXT_TO_INSET_OFFSET;
-       y += TEXT_TO_INSET_OFFSET;
+       if (status() == Open) {
+               if (openinlined_)
+                       x += dimensionCollapsed().wid;
+               else
+                       y += dimensionCollapsed().des + textdim_.asc;
+       }
+       if (status() != Collapsed)
+               InsetText::drawSelection(pi, x, y);
+}
 
-       if (status_ == Inlined) {
-               InsetText::draw(pi, x, y);
-       } else {
-               Dimension dimc;
-               dimension_collapsed(dimc);
-               int const aa  = ascent();
-               button_dim.x1 = x + 0;
-               button_dim.x2 = x + dimc.width();
-               button_dim.y1 = y - aa + pi.base.bv->top_y();
-               button_dim.y2 = y - aa + pi.base.bv->top_y() + dimc.height();
-
-               draw_collapsed(pi, x, y - aa + dimc.asc);
-               if (status_ == Open) {
-                       if (openinlined_)
-                               InsetText::draw(pi, x + dimc.width(),
-                                               y - aa + textdim_.asc);
-                       else
-                               InsetText::draw(pi, x, dimc.height()
-                                               + y - aa + textdim_.asc);
-               }
+
+void InsetCollapsable::cursorPos
+       (CursorSlice const & sl, bool boundary, int & x, int & y) const
+{
+       BOOST_ASSERT(status() != Collapsed);
+       
+       InsetText::cursorPos(sl, boundary, x, y);
+       
+       if (status() == Open) {
+               if (openinlined_)
+                       x += dimensionCollapsed().wid;
+               else
+                       y += dimensionCollapsed().height() - ascent()
+                               + TEXT_TO_INSET_OFFSET + textdim_.asc;
        }
-       setPosCache(pi, x, y);
+       x += TEXT_TO_INSET_OFFSET;
 }
 
 
-InsetOld::EDITABLE InsetCollapsable::editable() const
+InsetBase::EDITABLE InsetCollapsable::editable() const
 {
-       return status_ != Collapsed ? HIGHLY_EDITABLE : IS_EDITABLE;
+       return status() != Collapsed ? HIGHLY_EDITABLE : IS_EDITABLE;
 }
 
 
 bool InsetCollapsable::descendable() const
 {
-       return status_ != Collapsed;
+       return status() != Collapsed;
 }
 
 
-bool InsetCollapsable::hitButton(FuncRequest & cmd) const
+bool InsetCollapsable::hitButton(FuncRequest const & cmd) const
 {
        return button_dim.contains(cmd.x, cmd.y);
 }
@@ -218,7 +248,7 @@ string const InsetCollapsable::getNewLabel(string const & l) const
        pos_type const n = min(max_length, p_siz);
        pos_type i = 0;
        pos_type j = 0;
-       for; i < n && j < p_siz; ++j) {
+       for (; i < n && j < p_siz; ++j) {
                if (paragraphs().begin()->isInset(j))
                        continue;
                label += paragraphs().begin()->getChar(j);
@@ -236,45 +266,43 @@ void InsetCollapsable::edit(LCursor & cur, bool left)
        //lyxerr << "InsetCollapsable: edit left/right" << endl;
        cur.push(*this);
        InsetText::edit(cur, left);
-       open();
 }
 
 
-InsetBase * InsetCollapsable::editXY(LCursor & cur, int x, int y) const
+InsetBase * InsetCollapsable::editXY(LCursor & cur, int x, int y)
 {
-       cur.push(const_cast<InsetCollapsable&>(*this));
        //lyxerr << "InsetCollapsable: edit xy" << endl;
-       if (status_ == Collapsed) {
-               return const_cast<InsetCollapsable*>(this);
-       }
+       if (status() == Collapsed)
+               return this;
+       cur.push(*this);
        return InsetText::editXY(cur, x, y);
 }
 
 
-void InsetCollapsable::priv_dispatch(LCursor & cur, FuncRequest & cmd)
+void InsetCollapsable::doDispatch(LCursor & cur, FuncRequest & cmd)
 {
-//     lyxerr << "InsetCollapsable::priv_dispatch (begin): cmd: " << cmd
-//            << "  button y: " << button_dim.y2
-//            << "  coll/inline/open: " << status_ << endl;
-
-       lyxerr << "InsetCollapsable::priv_dispatch (begin): cmd: " << cmd
-               << " cur: " << cur << " bvcur: " << cur.bv().cursor() << endl;
+       //lyxerr << "InsetCollapsable::doDispatch (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);
+               if (status() == Inlined)
+                       InsetText::doDispatch(cur, cmd);
+               else if (status() == Open && !hitButton(cmd))
+                       InsetText::doDispatch(cur, cmd);
                else
-                 cur.noUpdate();
+                       cur.noUpdate();
                break;
 
        case LFUN_MOUSE_MOTION:
+       case LFUN_MOUSE_DOUBLE:
+       case LFUN_MOUSE_TRIPLE:
                if (status_ == Inlined)
-                       InsetText::priv_dispatch(cur, cmd);
-               else if (status_ == Open && !hitButton(cmd))
-                       InsetText::priv_dispatch(cur, cmd);
+                       InsetText::doDispatch(cur, cmd);
+               else if (status() && !hitButton(cmd))
+                       InsetText::doDispatch(cur, cmd);
+               else
+                       cur.undispatched();
                break;
 
        case LFUN_MOUSE_RELEASE:
@@ -283,81 +311,74 @@ void InsetCollapsable::priv_dispatch(LCursor & cur, FuncRequest & cmd)
                        break;
                }
 
-               switch (status_) {
+               switch (status()) {
 
                case Collapsed:
-                       lyxerr << "InsetCollapsable::lfunMouseRelease 1" << endl;
-                       open();
-                       InsetText::edit(cur, true);
+                       //lyxerr << "InsetCollapsable::lfunMouseRelease 1" << endl;
+                       setStatus(cur, Open);
+                       edit(cur, true);
                        cur.bv().cursor() = cur;
                        break;
 
                case Open: {
                        if (hitButton(cmd)) {
-                               lyxerr << "InsetCollapsable::lfunMouseRelease 2" << endl;
-                               setStatus(Collapsed);
-                               leaveInset(cur, *this);
+                               //lyxerr << "InsetCollapsable::lfunMouseRelease 2" << endl;
+                               setStatus(cur, Collapsed);
                                cur.bv().cursor() = cur;
                        } else {
-                               lyxerr << "InsetCollapsable::lfunMouseRelease 3" << endl;
-                               InsetText::priv_dispatch(cur, cmd);
+                               //lyxerr << "InsetCollapsable::lfunMouseRelease 3" << endl;
+                               InsetText::doDispatch(cur, cmd);
                        }
                        break;
                }
 
                case Inlined:
-                       lyxerr << "InsetCollapsable::lfunMouseRelease 4" << endl;
-                       InsetText::priv_dispatch(cur, cmd);
+                       //lyxerr << "InsetCollapsable::lfunMouseRelease 4" << endl;
+                       InsetText::doDispatch(cur, cmd);
                        break;
                }
                break;
 
        case LFUN_INSET_TOGGLE:
                if (cmd.argument == "open")
-                       setStatus(Open);
-               else if (cmd.argument == "close") {
-                       setStatus(Collapsed);
-                       leaveInset(cur, *this);
-               } else if (cmd.argument == "toggle"
-                          || cmd.argument.empty()) {
+                       setStatus(cur, Open);
+               else if (cmd.argument == "close")
+                       setStatus(cur, Collapsed);
+               else if (cmd.argument == "toggle" || cmd.argument.empty()) 
                        if (isOpen()) {
-                               setStatus(Collapsed);
-                               leaveInset(cur, *this);
-                       } else
-                               setStatus(Open);
-               } else // if assign or anything else
+                               setStatus(cur, Collapsed);
+                               cur.forwardPosNoDescend();
+                       }
+                       else
+                               setStatus(cur, Open);
+               else // if assign or anything else
                        cur.undispatched();
                cur.dispatched();
                break;
 
        default:
-               InsetText::priv_dispatch(cur, cmd);
+               InsetText::doDispatch(cur, cmd);
                break;
        }
 }
 
 
-int InsetCollapsable::scroll(bool recursive) const
-{
-       int sx = UpdatableInset::scroll(false);
-
-       if (recursive)
-               sx += InsetText::scroll(false);
-
-       return sx;
-}
-
-
-void InsetCollapsable::open()
+bool InsetCollapsable::getStatus(LCursor & cur, FuncRequest const & cmd,
+               FuncStatus & flag) const
 {
-       if (status_ == Collapsed)   // ...but not inlined
-               setStatus(Open);
-}
+       switch (cmd.action) {
 
+       case LFUN_INSET_TOGGLE:
+               if (cmd.argument == "open" || cmd.argument == "close" ||
+                   cmd.argument == "toggle")
+                       flag.enabled(true);
+               else
+                       flag.enabled(false);
+               return true;
 
-void InsetCollapsable::close()
-{
-       setStatus(Collapsed);
+       default:
+               return InsetText::getStatus(cur, cmd, flag);
+       }
 }
 
 
@@ -367,10 +388,12 @@ void InsetCollapsable::setLabel(string const & l)
 }
 
 
-void InsetCollapsable::setStatus(CollapseStatus st)
+void InsetCollapsable::setStatus(LCursor & cur, CollapseStatus status)
 {
-       status_ = st;
+       status_ = status;
        setButtonLabel();
+       if (status_ == Collapsed)
+               cur.leaveInset(*this);
 }
 
 
@@ -379,20 +402,3 @@ void InsetCollapsable::setLabelFont(LyXFont & font)
        labelfont_ = font;
 }
 
-
-void InsetCollapsable::scroll(BufferView & bv, float sx) const
-{
-       UpdatableInset::scroll(bv, sx);
-}
-
-
-void InsetCollapsable::scroll(BufferView & bv, int offset) const
-{
-       UpdatableInset::scroll(bv, offset);
-}
-
-
-Box const & InsetCollapsable::buttonDim() const
-{
-       return button_dim;
-}