X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetcollapsable.C;h=ce43acc582135c7dfc603ace9d0a760c7e93a5fe;hb=9f3dd22dd39c419522914846b21dd2b45720ad0a;hp=1910cf36c827a937f78b37b7e18262af510c1169;hpb=fd054e60b18496cef6527be18a99cd2ec3e48346;p=lyx.git diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C index 1910cf36c8..ce43acc582 100644 --- a/src/insets/insetcollapsable.C +++ b/src/insets/insetcollapsable.C @@ -25,6 +25,7 @@ #include "debug.h" #include "lyxtext.h" #include "font.h" +#include "lyxlex.h" class LyXText; @@ -36,9 +37,11 @@ using std::max; InsetCollapsable::InsetCollapsable(bool collapsed) : UpdatableInset(), collapsed_(collapsed), button_length(0), button_top_y(0), button_bottom_y(0), - label("Label"), draw_label(label), autocollapse(false), - oldWidth(0), need_update(FULL), - inlined(false), change_label_with_text(false) + need_update(NONE), label("Label"), +#if 0 + autocollapse(false), +#endif + oldWidth(0), in_update(false) { inset.setOwner(this); inset.setAutoBreakRows(true); @@ -52,22 +55,17 @@ InsetCollapsable::InsetCollapsable(InsetCollapsable const & in, bool same_id) : UpdatableInset(in, same_id), collapsed_(in.collapsed_), framecolor(in.framecolor), labelfont(in.labelfont), button_length(0), button_top_y(0), button_bottom_y(0), - label(in.label), draw_label(label), autocollapse(in.autocollapse), - oldWidth(0), need_update(FULL), - inlined(in.inlined), change_label_with_text(in.change_label_with_text) + need_update(NONE), label(in.label), +#if 0 + autocollapse(in.autocollapse), +#endif + oldWidth(0), in_update(false) { inset.init(&(in.inset), same_id); inset.setOwner(this); } -Inset * InsetCollapsable::clone(Buffer const &, bool same_id) const -{ - return new InsetCollapsable(*const_cast(this), - same_id); -} - - bool InsetCollapsable::insertInset(BufferView * bv, Inset * in) { if (!insetAllowed(in->lyxCode())) { @@ -89,86 +87,66 @@ void InsetCollapsable::write(Buffer const * buf, ostream & os) const void InsetCollapsable::read(Buffer const * buf, LyXLex & lex) { - if (lex.IsOK()) { + if (lex.isOK()) { lex.next(); - string const token = lex.GetString(); + string const token = lex.getString(); if (token == "collapsed") { lex.next(); - collapsed_ = lex.GetBool(); + collapsed_ = lex.getBool(); } else { lyxerr << "InsetCollapsable::Read: Missing collapsed!" << endl; + // Take countermeasures + lex.pushToken(token); } } inset.read(buf, lex); - if (collapsed_ && change_label_with_text) { - draw_label = get_new_label(); - } else { - draw_label = label; - } } -//int InsetCollapsable::ascent_collapsed(Painter & pain) const -int InsetCollapsable::ascent_collapsed(Painter & /*pain*/) const +int InsetCollapsable::ascent_collapsed() const { int width = 0; int ascent = 0; int descent = 0; -#if 0 - pain.buttonText(0, 0, draw_label, labelfont, false, - width, ascent, descent); -#else - lyxfont::buttonText(draw_label, labelfont, width, ascent, descent); -#endif + lyxfont::buttonText(label, labelfont, width, ascent, descent); return ascent; } -//int InsetCollapsable::descent_collapsed(Painter & pain) const -int InsetCollapsable::descent_collapsed(Painter & /*pain*/) const +int InsetCollapsable::descent_collapsed() const { int width = 0; int ascent = 0; int descent = 0; -#if 0 - pain.buttonText(0, 0, draw_label, labelfont, false, - width, ascent, descent); -#else - lyxfont::buttonText(draw_label, labelfont, width, ascent, descent); -#endif + lyxfont::buttonText(label, labelfont, width, ascent, descent); return descent; } //int InsetCollapsable::width_collapsed(Painter & pain) const -int InsetCollapsable::width_collapsed(Painter & /*pain*/) const +int InsetCollapsable::width_collapsed() const { int width; int ascent; int descent; -#if 0 - pain.buttonText(TEXT_TO_INSET_OFFSET, 0, draw_label, labelfont, false, - width, ascent, descent); -#else - lyxfont::buttonText(draw_label, labelfont, width, ascent, descent); -#endif + lyxfont::buttonText(label, labelfont, width, ascent, descent); return width + (2*TEXT_TO_INSET_OFFSET); } -int InsetCollapsable::ascent(BufferView * bv, LyXFont const &) const +int InsetCollapsable::ascent(BufferView * /*bv*/, LyXFont const &) const { - return ascent_collapsed(bv->painter()); + return ascent_collapsed(); } int InsetCollapsable::descent(BufferView * bv, LyXFont const & font) const { if (collapsed_) - return descent_collapsed(bv->painter()); + return descent_collapsed(); - return descent_collapsed(bv->painter()) + return descent_collapsed() + inset.descent(bv, font) + inset.ascent(bv, font) + TEXT_TO_BOTTOM_OFFSET; @@ -178,47 +156,44 @@ int InsetCollapsable::descent(BufferView * bv, LyXFont const & font) const int InsetCollapsable::width(BufferView * bv, LyXFont const & font) const { if (collapsed_) - return width_collapsed(bv->painter()); + return width_collapsed(); - int widthCollapsed = width_collapsed(bv->painter()); + int widthCollapsed = width_collapsed(); return (inset.width(bv, font) > widthCollapsed) ? inset.width(bv, font) : widthCollapsed; } -void InsetCollapsable::draw_collapsed(Painter & pain, int baseline, float & x) const +void InsetCollapsable::draw_collapsed(Painter & pain, + int baseline, float & x) const { -#if 0 - int width = 0; pain.buttonText(int(x) + TEXT_TO_INSET_OFFSET, - baseline, draw_label, labelfont, true, width); -#else - pain.buttonText(int(x) + TEXT_TO_INSET_OFFSET, - baseline, draw_label, labelfont); -#endif -#if 0 - x += width + TEXT_TO_INSET_OFFSET; -#else - x += width_collapsed(pain) + TEXT_TO_INSET_OFFSET; -#endif + baseline, label, labelfont); + x += width_collapsed(); } void InsetCollapsable::draw(BufferView * bv, LyXFont const & f, int baseline, float & x, bool cleared) const { + if (need_update != NONE) { + const_cast(&inset)->update(bv, f, true); + bv->text->status(bv, LyXText::CHANGED_IN_DRAW); + need_update = NONE; + return; + } if (nodraw()) return; Painter & pain = bv->painter(); - button_length = width_collapsed(pain); + button_length = width_collapsed(); button_top_y = -ascent(bv, f); - button_bottom_y = -ascent(bv, f) + ascent_collapsed(pain) + - descent_collapsed(pain); + button_bottom_y = -ascent(bv, f) + ascent_collapsed() + + descent_collapsed(); - if (collapsed_) { + if (!isOpen()) { draw_collapsed(pain, baseline, x); x += TEXT_TO_INSET_OFFSET; return; @@ -226,50 +201,33 @@ void InsetCollapsable::draw(BufferView * bv, LyXFont const & f, float old_x = x; -#if 0 - UpdatableInset::draw(bv, f, baseline, x, cleared); -#else if (!owner()) x += static_cast(scroll()); -#endif + if (!cleared && (inset.need_update == InsetText::FULL || - inset.need_update == InsetText::INIT || - top_x != int(x) || - top_baseline != baseline)) + inset.need_update == InsetText::INIT || + top_x != int(x) || + top_baseline != baseline)) { -#if 1 // we don't need anymore to clear here we just have to tell // the underlying LyXText that it should do the RowClear! inset.setUpdateStatus(bv, InsetText::FULL); bv->text->status(bv, LyXText::CHANGED_IN_DRAW); return; -#else - int w = owner() ? width(bv, f) : pain.paperWidth(); - int h = ascent(bv, f) + descent(bv, f); - int const tx = (needFullRow() && !owner()) ? 0 : int(x); - int const ty = max(0, baseline - ascent(bv, f)); - - if ((ty + h) > pain.paperHeight()) - h = pain.paperHeight(); - if ((top_x + w) > pain.paperWidth()) - w = pain.paperWidth(); - if (baseline < 0) - h += (baseline - ascent(bv, f)); - pain.fillRectangle(tx, ty - 1, w, h + 2); - cleared = true; -#endif } top_x = int(x); + topx_set = true; top_baseline = baseline; - int const bl = baseline - ascent(bv, f) + ascent_collapsed(pain); - + int const bl = baseline - ascent(bv, f) + ascent_collapsed(); + draw_collapsed(pain, bl, old_x); inset.draw(bv, f, - bl + descent_collapsed(pain) + inset.ascent(bv, f), - x, cleared); - need_update = NONE; + bl + descent_collapsed() + inset.ascent(bv, f), + x, cleared); + if (x < (top_x + button_length + TEXT_TO_INSET_OFFSET)) + x = top_x + button_length + TEXT_TO_INSET_OFFSET; } @@ -279,11 +237,13 @@ void InsetCollapsable::edit(BufferView * bv, int xp, int yp, UpdatableInset::edit(bv, xp, yp, button); if (collapsed_) { - draw_label = label; collapsed_ = false; + // set this only here as it should be recollapsed only if + // it was already collapsed! + first_after_edit = true; if (!bv->lockInset(this)) return; - bv->updateInset(this, false); + bv->updateInset(this, true); inset.edit(bv); } else { if (!bv->lockInset(this)) @@ -293,8 +253,8 @@ void InsetCollapsable::edit(BufferView * bv, int xp, int yp, } else { LyXFont font(LyXFont::ALL_SANE); int yy = ascent(bv, font) + yp - - (ascent_collapsed(bv->painter()) + - descent_collapsed(bv->painter()) + + (ascent_collapsed() + + descent_collapsed() + inset.ascent(bv, font)); inset.edit(bv, xp, yy, button); } @@ -307,18 +267,18 @@ void InsetCollapsable::edit(BufferView * bv, bool front) UpdatableInset::edit(bv, front); if (collapsed_) { - draw_label = label; collapsed_ = false; if (!bv->lockInset(this)) return; inset.setUpdateStatus(bv, InsetText::FULL); - bv->updateInset(this, false); + bv->updateInset(this, true); inset.edit(bv, front); } else { if (!bv->lockInset(this)) return; inset.edit(bv, front); } + first_after_edit = true; } @@ -332,6 +292,7 @@ Inset::EDITABLE InsetCollapsable::editable() const void InsetCollapsable::insetUnlock(BufferView * bv) { +#if 0 if (autocollapse) { if (change_label_with_text) { draw_label = get_new_label(); @@ -340,6 +301,7 @@ void InsetCollapsable::insetUnlock(BufferView * bv) } collapsed_ = true; } +#endif inset.insetUnlock(bv); if (scroll()) scroll(bv, 0.0F); @@ -347,14 +309,14 @@ void InsetCollapsable::insetUnlock(BufferView * bv) } -void InsetCollapsable::insetButtonPress(BufferView * bv, int x, int y, - int button) +void InsetCollapsable::insetButtonPress(BufferView * bv, + int x, int y, int button) { if (!collapsed_ && (y > button_bottom_y)) { LyXFont font(LyXFont::ALL_SANE); int yy = ascent(bv, font) + y - - (ascent_collapsed(bv->painter()) + - descent_collapsed(bv->painter()) + + (ascent_collapsed() + + descent_collapsed() + inset.ascent(bv, font)); inset.insetButtonPress(bv, x, yy, button); } @@ -362,31 +324,27 @@ void InsetCollapsable::insetButtonPress(BufferView * bv, int x, int y, void InsetCollapsable::insetButtonRelease(BufferView * bv, - int x, int y, int button) + int x, int y, int button) { if ((x >= 0) && (x < button_length) && - (y >= button_top_y) && (y <= button_bottom_y)) { + (y >= button_top_y) && (y <= button_bottom_y)) + { if (collapsed_) { - draw_label = label; collapsed_ = false; - inset.insetButtonRelease(bv, 0, 0, button); +// should not be called on inset open! +// inset.insetButtonRelease(bv, 0, 0, button); inset.setUpdateStatus(bv, InsetText::FULL); - bv->updateInset(this, false); + bv->updateInset(this, true); } else { - if (change_label_with_text) { - draw_label = get_new_label(); - } else { - draw_label = label; - } collapsed_ = true; bv->unlockInset(this); - bv->updateInset(this, false); + bv->updateInset(this, true); } } else if (!collapsed_ && (y > button_bottom_y)) { LyXFont font(LyXFont::ALL_SANE); int yy = ascent(bv, font) + y - - (ascent_collapsed(bv->painter()) + - descent_collapsed(bv->painter()) + + (ascent_collapsed() + + descent_collapsed() + inset.ascent(bv, font)); inset.insetButtonRelease(bv, x, yy, button); } @@ -394,13 +352,13 @@ void InsetCollapsable::insetButtonRelease(BufferView * bv, void InsetCollapsable::insetMotionNotify(BufferView * bv, - int x, int y, int state) + int x, int y, int state) { if (y > button_bottom_y) { LyXFont font(LyXFont::ALL_SANE); int yy = ascent(bv, font) + y - - (ascent_collapsed(bv->painter()) + - descent_collapsed(bv->painter()) + + (ascent_collapsed() + + descent_collapsed() + inset.ascent(bv, font)); inset.insetMotionNotify(bv, x, yy, state); } @@ -414,16 +372,17 @@ void InsetCollapsable::insetKeyPress(XKeyEvent * xke) int InsetCollapsable::latex(Buffer const * buf, ostream & os, - bool fragile, bool free_spc) const + bool fragile, bool free_spc) const { return inset.latex(buf, os, fragile, free_spc); } int InsetCollapsable::getMaxWidth(BufferView * bv, - UpdatableInset const * inset) const + UpdatableInset const * in) const { - int const w = UpdatableInset::getMaxWidth(bv, inset); +#if 0 + int const w = UpdatableInset::getMaxWidth(bv, in); if (w < 0) { // What does a negative max width signify? (Lgb) @@ -431,14 +390,28 @@ int InsetCollapsable::getMaxWidth(BufferView * bv, return w; } // should be at least 30 pixels !!! - return max(30, w - width_collapsed(bv->painter())); + return max(30, w - width_collapsed()); +#else + return UpdatableInset::getMaxWidth(bv, in); +#endif } void InsetCollapsable::update(BufferView * bv, LyXFont const & font, - bool reinit) + bool reinit) { + if (in_update) { + if (reinit && owner()) { + owner()->update(bv, font, true); + } + return; + } + in_update = true; inset.update(bv, font, reinit); + if (reinit && owner()) { + owner()->update(bv, font, true); + } + in_update = false; } @@ -449,6 +422,7 @@ InsetCollapsable::localDispatch(BufferView * bv, kb_action action, UpdatableInset::RESULT result = inset.localDispatch(bv, action, arg); if (result == FINISHED) bv->unlockInset(this); + first_after_edit = false; return result; } @@ -592,6 +566,7 @@ int InsetCollapsable::scroll(bool recursive) const Paragraph * InsetCollapsable::getParFromID(int id) const { + lyxerr[Debug::INFO] << "Looking for paragraph " << id << endl; return inset.getParFromID(id); } @@ -615,48 +590,57 @@ Inset * InsetCollapsable::getInsetFromID(int id_arg) const return inset.getInsetFromID(id_arg); } -void InsetCollapsable::open(BufferView * bv, bool flag) + +void InsetCollapsable::open(BufferView * bv) { - if (flag == !collapsed_) + if (!collapsed_) return; + + collapsed_ = false; + bv->updateInset(this, true); +} + + +void InsetCollapsable::close(BufferView * bv) const +{ + if (collapsed_) return; - collapsed_ = !flag; - if (collapsed_ && change_label_with_text) { - draw_label = get_new_label(); - } else { - draw_label = label; - } - bv->updateInset(this, false); + + collapsed_ = true; + bv->updateInset(const_cast(this), true); } -void InsetCollapsable::setLabel(string const & l, bool flag) +void InsetCollapsable::setLabel(string const & l) const { label = l; - change_label_with_text = flag; - if (collapsed_ && change_label_with_text) { - draw_label = get_new_label(); - } else { - draw_label = label; - } } -string InsetCollapsable::get_new_label() const +bool InsetCollapsable::searchForward(BufferView * bv, string const & str, + bool const & cs, bool const & mw) +{ + bool found = inset.searchForward(bv, str, cs, mw); + if (first_after_edit && !found) + close(bv); + first_after_edit = false; + return found; +} +bool InsetCollapsable::searchBackward(BufferView * bv, string const & str, + bool const & cs, bool const & mw) { - string la; - Paragraph::size_type const max_length = 15; + bool found = inset.searchBackward(bv, str, cs, mw); + if (first_after_edit && !found) + close(bv); + first_after_edit = false; + return found; +} - int n = std::min(max_length, inset.paragraph()->size()); - int i,j; - for(i=0,j=0; i < n && j < inset.paragraph()->size(); ++j) { - if (inset.paragraph()->isInset(j)) - continue; - la += inset.paragraph()->getChar(j); - ++i; - } - if ((i > 0) && (j < inset.paragraph()->size())) - la += "..."; - if (la.empty()) - la = label; - return la; + +string const InsetCollapsable::selectNextWord(BufferView * bv, float & value) const +{ + string str = inset.selectNextWord(bv, value); + if (first_after_edit && str.empty()) + close(bv); + first_after_edit = false; + return str; }