/* This file is part of
* ======================================================
- *
+ *
* LyX, The Document Processor
- *
+ *
* Copyright 1998-2001 The LyX Team.
*
* ======================================================
#include "gettext.h"
#include "lyxfont.h"
#include "BufferView.h"
-#include "Painter.h"
-#include "insets/insettext.h"
-#include "support/LOstream.h"
-#include "support/lstrings.h"
+#include "frontends/Painter.h"
#include "debug.h"
#include "lyxtext.h"
-#include "font.h"
+#include "frontends/font_metrics.h"
#include "lyxlex.h"
-class LyXText;
+#include "insets/insettext.h"
+
+#include "support/LOstream.h"
+#include "support/lstrings.h"
+using std::vector;
using std::ostream;
using std::endl;
using std::max;
-InsetCollapsable::InsetCollapsable(bool collapsed)
- : UpdatableInset(), collapsed_(collapsed),
+class LyXText;
+
+
+InsetCollapsable::InsetCollapsable(BufferParams const & bp, bool collapsed)
+ : UpdatableInset(), collapsed_(collapsed), inset(bp),
button_length(0), button_top_y(0), button_bottom_y(0),
- need_update(FULL), label("Label"),
+ need_update(NONE), label("Label"),
#if 0
autocollapse(false),
#endif
- oldWidth(0)
+ oldWidth(0), in_update(false), first_after_edit(false)
{
inset.setOwner(this);
inset.setAutoBreakRows(true);
InsetCollapsable::InsetCollapsable(InsetCollapsable const & in, bool same_id)
- : UpdatableInset(in, same_id), collapsed_(in.collapsed_),
- framecolor(in.framecolor), labelfont(in.labelfont),
+ : UpdatableInset(in, same_id), collapsed_(in.collapsed_),
+ framecolor(in.framecolor), labelfont(in.labelfont), inset(in.inset),
button_length(0), button_top_y(0), button_bottom_y(0),
- need_update(FULL), label(in.label),
+ need_update(NONE), label(in.label),
#if 0
autocollapse(in.autocollapse),
#endif
- oldWidth(0)
+ oldWidth(0), in_update(false), first_after_edit(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;
int width = 0;
int ascent = 0;
int descent = 0;
- lyxfont::buttonText(label, labelfont, width, ascent, descent);
+ font_metrics::buttonText(label, labelfont, width, ascent, descent);
return ascent;
}
int width = 0;
int ascent = 0;
int descent = 0;
- lyxfont::buttonText(label, labelfont, width, ascent, descent);
+ font_metrics::buttonText(label, labelfont, width, ascent, descent);
return descent;
}
int width;
int ascent;
int descent;
- lyxfont::buttonText(label, labelfont, width, ascent, descent);
+ font_metrics::buttonText(label, labelfont, width, ascent, descent);
return width + (2*TEXT_TO_INSET_OFFSET);
}
int InsetCollapsable::descent(BufferView * bv, LyXFont const & font) const
{
- if (collapsed_)
+ if (collapsed_)
return descent_collapsed();
return descent_collapsed()
int InsetCollapsable::width(BufferView * bv, LyXFont const & font) const
{
- if (collapsed_)
+ if (collapsed_)
return width_collapsed();
int widthCollapsed = width_collapsed();
}
-void InsetCollapsable::draw(BufferView * bv, LyXFont const & f,
- int baseline, float & x, bool cleared) const
+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;
if (!isOpen()) {
draw_collapsed(pain, baseline, x);
- x += TEXT_TO_INSET_OFFSET;
return;
}
x += static_cast<float>(scroll());
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))
{
// we don't need anymore to clear here we just have to tell
// the underlying LyXText that it should do the RowClear!
}
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,
+ inset.draw(bv, f,
bl + descent_collapsed() + inset.ascent(bv, f),
x, cleared);
- need_update = NONE;
+ if (x < (top_x + button_length + TEXT_TO_INSET_OFFSET))
+ x = top_x + button_length + TEXT_TO_INSET_OFFSET;
}
void InsetCollapsable::edit(BufferView * bv, int xp, int yp,
- unsigned int button)
+ mouse_button::state button)
{
UpdatableInset::edit(bv, xp, yp, button);
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, true);
+ bv->updateInset(this, false);
inset.edit(bv);
} else {
if (!bv->lockInset(this))
return;
if (yp <= button_bottom_y) {
- inset.edit(bv);
+ inset.edit(bv, xp, 0, button);
} else {
LyXFont font(LyXFont::ALL_SANE);
int yy = ascent(bv, font) + yp -
if (!bv->lockInset(this))
return;
inset.setUpdateStatus(bv, InsetText::FULL);
- bv->updateInset(this, true);
+ bv->updateInset(this, false);
inset.edit(bv, front);
+ first_after_edit = true;
} else {
if (!bv->lockInset(this))
return;
void InsetCollapsable::insetButtonPress(BufferView * bv,
- int x, int y, int button)
+ int x, int y, mouse_button::state button)
{
if (!collapsed_ && (y > button_bottom_y)) {
LyXFont font(LyXFont::ALL_SANE);
}
-void InsetCollapsable::insetButtonRelease(BufferView * bv,
- int x, int y, int button)
+bool InsetCollapsable::insetButtonRelease(BufferView * bv,
+ int x, int y, mouse_button::state button)
{
- if ((x >= 0) && (x < button_length) &&
+ bool ret = false;
+ if ((button != mouse_button::button3) && (x < button_length) &&
(y >= button_top_y) && (y <= button_bottom_y))
{
if (collapsed_) {
// should not be called on inset open!
// inset.insetButtonRelease(bv, 0, 0, button);
inset.setUpdateStatus(bv, InsetText::FULL);
- bv->updateInset(this, true);
+ bv->updateInset(this, false);
} else {
collapsed_ = true;
bv->unlockInset(this);
- bv->updateInset(this, true);
+ bv->updateInset(this, false);
}
} else if (!collapsed_ && (y > button_bottom_y)) {
LyXFont font(LyXFont::ALL_SANE);
(ascent_collapsed() +
descent_collapsed() +
inset.ascent(bv, font));
- inset.insetButtonRelease(bv, x, yy, button);
+ ret = inset.insetButtonRelease(bv, x, yy, button);
+ }
+ if ((button == mouse_button::button3) && !ret) {
+ return showInsetDialog(bv);
}
+ return ret;
}
void InsetCollapsable::insetMotionNotify(BufferView * bv,
- int x, int y, int state)
+ int x, int y, mouse_button::state state)
{
if (y > button_bottom_y) {
LyXFont font(LyXFont::ALL_SANE);
}
-void InsetCollapsable::insetKeyPress(XKeyEvent * xke)
+int InsetCollapsable::latex(Buffer const * buf, ostream & os,
+ bool fragile, bool free_spc) const
{
- inset.insetKeyPress(xke);
+ return inset.latex(buf, os, fragile, free_spc);
}
-int InsetCollapsable::latex(Buffer const * buf, ostream & os,
- bool fragile, bool free_spc) const
+int InsetCollapsable::ascii(Buffer const * buf, ostream & os, int ll) const
{
- return inset.latex(buf, os, fragile, free_spc);
+ return inset.ascii(buf, os, ll);
}
+int InsetCollapsable::linuxdoc(Buffer const * buf, ostream & os) const
+{
+ return inset.linuxdoc(buf, os);
+}
+
+
+int InsetCollapsable::docbook(Buffer const * buf, ostream & os) const
+{
+ return inset.docbook(buf, os);
+}
+
+#if 0
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
}
+#endif
void InsetCollapsable::update(BufferView * bv, LyXFont const & font,
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;
}
string const & arg)
{
UpdatableInset::RESULT result = inset.localDispatch(bv, action, arg);
- if (result == FINISHED)
+ if (result >= FINISHED)
bv->unlockInset(this);
+ first_after_edit = false;
return result;
}
bool InsetCollapsable::updateInsetInInset(BufferView * bv, Inset *in)
{
- if (&inset == in)
+ if (in == this)
return true;
return inset.updateInsetInInset(bv, in);
}
-unsigned int InsetCollapsable::insetInInsetY()
+int InsetCollapsable::insetInInsetY() const
{
return inset.insetInInsetY() - (top_baseline - inset.y());
}
void InsetCollapsable::setFont(BufferView * bv, LyXFont const & font,
- bool toggleall, bool selectall)
+ bool toggleall, bool selectall)
{
inset.setFont(bv, font, toggleall, selectall);
}
}
-std::vector<string> const InsetCollapsable::getLabelList() const
+vector<string> const InsetCollapsable::getLabelList() const
{
return inset.getLabelList();
}
return inset.nodraw();
}
-
+
int InsetCollapsable::scroll(bool recursive) const
{
int sx = UpdatableInset::scroll(false);
Paragraph * InsetCollapsable::getParFromID(int id) const
{
+ lyxerr[Debug::INFO] << "Looking for paragraph " << id << endl;
return inset.getParFromID(id);
}
}
+Paragraph * InsetCollapsable::getFirstParagraph(int i) const
+{
+ return inset.getFirstParagraph(i);
+}
+
+
LyXCursor const & InsetCollapsable::cursor(BufferView * bv) const
{
return inset.cursor(bv);
void InsetCollapsable::open(BufferView * bv)
{
if (!collapsed_) return;
-
+
collapsed_ = false;
- bv->updateInset(this, true);
+ bv->updateInset(this, false);
}
-void InsetCollapsable::close(BufferView * bv)
+void InsetCollapsable::close(BufferView * bv) const
{
if (collapsed_)
return;
-
+
collapsed_ = true;
- bv->updateInset(this, true);
+ bv->updateInset(const_cast<InsetCollapsable *>(this), false);
}
-void InsetCollapsable::setLabel(string const & l)
+void InsetCollapsable::setLabel(string const & l) const
{
label = l;
}
+
+
+bool InsetCollapsable::searchForward(BufferView * bv, string const & str,
+ bool cs, bool 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 cs, bool 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::selectNextWordToSpellcheck(BufferView * bv,
+ float & value) const
+{
+ string const str = inset.selectNextWordToSpellcheck(bv, value);
+ if (first_after_edit && str.empty())
+ close(bv);
+ first_after_edit = false;
+ return str;
+}
projects / lyx.git / blobdiff