InsetCollapsable::InsetCollapsable(bool collapsed)
: UpdatableInset(), collapsed_(collapsed),
button_length(0), button_top_y(0), button_bottom_y(0),
- label("Label"),
+ need_update(NONE), label("Label"),
#if 0
autocollapse(false),
#endif
- oldWidth(0), need_update(FULL),
- inlined(false)
+ oldWidth(0), in_update(false)
{
inset.setOwner(this);
inset.setAutoBreakRows(true);
: 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),
+ need_update(NONE), label(in.label),
#if 0
- autocollapse(in.autocollapse),
+ autocollapse(in.autocollapse),
#endif
- oldWidth(0), need_update(FULL),
- inlined(in.inlined)
+ oldWidth(0), in_update(false)
{
inset.init(&(in.inset), same_id);
inset.setOwner(this);
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;
void InsetCollapsable::draw(BufferView * bv, LyXFont const & f,
int baseline, float & x, bool cleared) const
{
+ if (need_update != NONE) {
+ const_cast<InsetText *>(&inset)->update(bv, f, true);
+ bv->text->status(bv, LyXText::CHANGED_IN_DRAW);
+ need_update = NONE;
+ return;
+ }
if (nodraw())
return;
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;
float old_x = x;
-#if 0
- UpdatableInset::draw(bv, f, baseline, x, cleared);
-#else
if (!owner())
x += static_cast<float>(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();
-
+
draw_collapsed(pain, bl, old_x);
inset.draw(bv, f,
- bl + descent_collapsed() + 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;
}
if (collapsed_) {
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))
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;
}
}
-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);
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_) {
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 {
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);
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 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)
}
// should be at least 30 pixels !!!
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;
}
UpdatableInset::RESULT result = inset.localDispatch(bv, action, arg);
if (result == FINISHED)
bv->unlockInset(this);
+ first_after_edit = false;
return result;
}
Paragraph * InsetCollapsable::getParFromID(int id) const
{
+ lyxerr[Debug::INFO] << "Looking for paragraph " << id << endl;
return inset.getParFromID(id);
}
if (!collapsed_) return;
collapsed_ = false;
- bv->updateInset(this, false);
+ bv->updateInset(this, true);
}
-void InsetCollapsable::close(BufferView * bv)
+void InsetCollapsable::close(BufferView * bv) const
{
- if (collapsed_) return;
+ if (collapsed_)
+ return;
collapsed_ = true;
- bv->updateInset(this, false);
+ bv->updateInset(const_cast<InsetCollapsable *>(this), true);
}
-void InsetCollapsable::setLabel(string const & l)
+void InsetCollapsable::setLabel(string const & l) const
{
label = l;
}
+
+
+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)
+{
+ bool found = inset.searchBackward(bv, str, cs, mw);
+ if (first_after_edit && !found)
+ close(bv);
+ first_after_edit = false;
+ return found;
+}
+
+
+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;
+}
projects / lyx.git / blobdiff