#include <config.h>
-
#include "insetcollapsable.h"
#include "insettext.h"
#include "lyxtext.h"
#include "WordLangTuple.h"
#include "funcrequest.h"
+#include "buffer.h"
#include "frontends/font_metrics.h"
#include "frontends/Painter.h"
#include "support/LAssert.h"
#include "support/LOstream.h"
-#include "support/lstrings.h"
using std::vector;
using std::ostream;
using std::max;
-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(NONE), label("Label"),
+ label("Label"),
#if 0
autocollapse(false),
#endif
: 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(NONE), label(in.label),
+ label(in.label),
#if 0
autocollapse(in.autocollapse),
#endif
void InsetCollapsable::write(Buffer const * buf, ostream & os) const
{
- os << "collapsed " << tostr(collapsed_) << "\n";
+ os << "collapsed " << (collapsed_ ? "true" : "false") << "\n";
inset.writeParagraphData(buf, os);
}
if (collapsed_)
return width_collapsed();
- int widthCollapsed = width_collapsed();
+ int const collapsed_width = width_collapsed();
+ int const contents_width = inset.width(bv, font);
- return (inset.width(bv, font) > widthCollapsed) ?
- inset.width(bv, font) : widthCollapsed;
+ return max(collapsed_width, contents_width);
}
void InsetCollapsable::draw(BufferView * bv, LyXFont const & f,
- int baseline, float & x, bool cleared) const
+ int baseline, float & x, bool inlined) const
{
lyx::Assert(bv);
cache(bv);
- 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;
float old_x = x;
if (!owner())
- x += static_cast<float>(scroll());
-
- if (!cleared && (inset.need_update == InsetText::FULL ||
- 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!
- inset.setUpdateStatus(bv, InsetText::FULL);
- bv->text->status(bv, LyXText::CHANGED_IN_DRAW);
- return;
- }
+ x += scroll();
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);
- 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,
- mouse_button::state button)
-{
-#ifdef WITH_WARNINGS
-#warning Fix this properly in BufferView_pimpl::workAreaButtonRelease
-#endif
- if (button == mouse_button::button3)
- return;
-
- 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, false);
- inset.edit(bv);
+ if (inlined) {
+ inset.draw(bv, f, baseline, x);
} else {
- if (!bv->lockInset(this))
- return;
- if (yp <= button_bottom_y) {
- inset.edit(bv, xp, 0, button);
- } else {
- LyXFont font(LyXFont::ALL_SANE);
- int yy = ascent(bv, font) + yp -
- (ascent_collapsed() +
- descent_collapsed() +
- inset.ascent(bv, font));
- inset.edit(bv, xp, yy, button);
- }
+ draw_collapsed(pain, bl, old_x);
+ inset.draw(bv, f, bl + descent_collapsed() + inset.ascent(bv, f), x);
+ // contained inset may be shorter than the button
+ if (x < (top_x + button_length + TEXT_TO_INSET_OFFSET))
+ x = top_x + button_length + TEXT_TO_INSET_OFFSET;
}
}
-void InsetCollapsable::edit(BufferView * bv, bool front)
+void InsetCollapsable::draw(BufferView * bv, LyXFont const & f,
+ int baseline, float & x) const
{
- UpdatableInset::edit(bv, front);
-
- if (collapsed_) {
- collapsed_ = false;
- if (!bv->lockInset(this))
- return;
- inset.setUpdateStatus(bv, InsetText::FULL);
- bv->updateInset(this, false);
- inset.edit(bv, front);
- first_after_edit = true;
- } else {
- if (!bv->lockInset(this))
- return;
- inset.edit(bv, front);
- }
+ // by default, we are not inlined-drawing
+ draw(bv, f, baseline, x, false);
}
Inset::EDITABLE InsetCollapsable::editable() const
{
- if (collapsed_)
- return IS_EDITABLE;
- return HIGHLY_EDITABLE;
+ return collapsed_ ? IS_EDITABLE : HIGHLY_EDITABLE;
}
inset.insetUnlock(bv);
if (scroll())
scroll(bv, 0.0F);
- bv->updateInset(this, false);
+ bv->updateInset(this);
}
-void InsetCollapsable::lfunMousePress(FuncRequest const & cmd)
+FuncRequest InsetCollapsable::adjustCommand(FuncRequest const & cmd)
{
- if (!collapsed_ && (cmd.y > button_bottom_y)) {
- LyXFont font(LyXFont::ALL_SANE);
- FuncRequest cmd1 = cmd;
- cmd1.y = ascent(cmd.view(), font) + cmd.y -
- (ascent_collapsed() +
- descent_collapsed() +
- inset.ascent(cmd.view(), font));
- inset.localDispatch(cmd1);
- }
+ LyXFont font(LyXFont::ALL_SANE);
+ FuncRequest cmd1 = cmd;
+ cmd1.y = ascent(cmd.view(), font) + cmd.y -
+ (ascent_collapsed() +
+ descent_collapsed() +
+ inset.ascent(cmd.view(), font));
+ return cmd1;
}
-bool InsetCollapsable::lfunMouseRelease(FuncRequest const & cmd)
+void InsetCollapsable::lfunMouseRelease(FuncRequest const & cmd)
{
bool ret = false;
BufferView * bv = cmd.view();
+
+ if (collapsed_ && cmd.button() != mouse_button::button3) {
+ collapsed_ = false;
+ inset.setUpdateStatus(bv, InsetText::FULL);
+ bv->updateInset(this);
+ bv->buffer()->markDirty();
+ return;
+ }
+
if ((cmd.button() != mouse_button::button3) && (cmd.x < button_length) &&
(cmd.y >= button_top_y) && (cmd.y <= button_bottom_y))
{
if (collapsed_) {
collapsed_ = false;
-// 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);
+ bv->buffer()->markDirty();
} else {
collapsed_ = true;
bv->unlockInset(this);
- bv->updateInset(this, false);
+ bv->updateInset(this);
+ bv->buffer()->markDirty();
}
} else if (!collapsed_ && (cmd.y > button_bottom_y)) {
- LyXFont font(LyXFont::ALL_SANE);
- FuncRequest cmd1 = cmd;
- cmd1.y = ascent(cmd.view(), font) + cmd.y -
- (ascent_collapsed() +
- descent_collapsed() +
- inset.ascent(cmd.view(), font));
- ret = (inset.localDispatch(cmd1) == DISPATCHED);
+ ret = (inset.localDispatch(adjustCommand(cmd)) == DISPATCHED);
}
if (cmd.button() == mouse_button::button3 && !ret)
- return showInsetDialog(bv);
- return ret;
-}
-
-
-void InsetCollapsable::lfunMouseMotion(FuncRequest const & cmd)
-{
- if (cmd.y > button_bottom_y) {
- LyXFont font(LyXFont::ALL_SANE);
- FuncRequest cmd1 = cmd;
- cmd1.y = ascent(cmd.view(), font) + cmd.y -
- (ascent_collapsed() +
- descent_collapsed() +
- inset.ascent(cmd.view(), font));
- inset.localDispatch(cmd1);
- }
+ showInsetDialog(bv);
}
return inset.docbook(buf, os, mixcont);
}
-#if 0
-int InsetCollapsable::getMaxWidth(BufferView * bv,
- UpdatableInset const * in) const
-{
-#if 0
- int const w = UpdatableInset::getMaxWidth(bv, in);
-
- if (w < 0) {
- // What does a negative max width signify? (Lgb)
- // Use the max width of the draw-area (Jug)
- return w;
- }
- // 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)
+void InsetCollapsable::update(BufferView * bv, bool reinit)
{
if (in_update) {
if (reinit && owner()) {
- owner()->update(bv, font, true);
+ owner()->update(bv, true);
}
return;
}
in_update = true;
- inset.update(bv, font, reinit);
+ inset.update(bv, reinit);
if (reinit && owner()) {
- owner()->update(bv, font, true);
+ owner()->update(bv, true);
}
in_update = false;
}
Inset::RESULT InsetCollapsable::localDispatch(FuncRequest const & cmd)
{
+ //lyxerr << "InsetCollapsable::localDispatch: " << cmd.action << "\n";
+ BufferView * bv = cmd.view();
switch (cmd.action) {
+ case LFUN_INSET_EDIT: {
+ if (!cmd.argument.empty()) {
+ UpdatableInset::localDispatch(cmd);
+ if (collapsed_) {
+ collapsed_ = false;
+ if (bv->lockInset(this)) {
+ inset.setUpdateStatus(bv, InsetText::FULL);
+ bv->updateInset(this);
+ bv->buffer()->markDirty();
+ inset.localDispatch(cmd);
+ first_after_edit = true;
+ }
+ } else {
+ if (bv->lockInset(this))
+ inset.localDispatch(cmd);
+ }
+ return DISPATCHED;
+ }
+
+#ifdef WITH_WARNINGS
+#warning Fix this properly in BufferView_pimpl::workAreaButtonRelease
+#endif
+ if (cmd.button() == mouse_button::button3)
+ return DISPATCHED;
+
+ UpdatableInset::localDispatch(cmd);
+
+ 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 DISPATCHED;
+ bv->updateInset(this);
+ bv->buffer()->markDirty();
+ inset.localDispatch(cmd);
+ } else {
+ FuncRequest cmd1 = cmd;
+ if (!bv->lockInset(this))
+ return DISPATCHED;
+ if (cmd.y <= button_bottom_y) {
+ cmd1.y = 0;
+ } else {
+ LyXFont font(LyXFont::ALL_SANE);
+ cmd1.y = ascent(bv, font) + cmd.y -
+ (ascent_collapsed() +
+ descent_collapsed() +
+ inset.ascent(bv, font));
+ }
+ inset.localDispatch(cmd);
+ }
+ return DISPATCHED;
+ }
case LFUN_MOUSE_PRESS:
- lfunMousePress(cmd);
+ if (!collapsed_ && cmd.y > button_bottom_y)
+ inset.localDispatch(adjustCommand(cmd));
return DISPATCHED;
case LFUN_MOUSE_MOTION:
- lfunMouseMotion(cmd);
+ if (!collapsed_ && cmd.y > button_bottom_y)
+ inset.localDispatch(adjustCommand(cmd));
return DISPATCHED;
case LFUN_MOUSE_RELEASE:
default:
UpdatableInset::RESULT result = inset.localDispatch(cmd);
if (result >= FINISHED)
- cmd.view()->unlockInset(this);
+ bv->unlockInset(this);
first_after_edit = false;
return result;
}
- return UNDISPATCHED;
}
}
-void InsetCollapsable::getCursorPos(BufferView * bv, int & x, int & y) const
+void InsetCollapsable::getCursor(BufferView & bv, int & x, int & y) const
{
- inset.getCursorPos(bv, x , y);
-}
-
-
-void InsetCollapsable::toggleInsetCursor(BufferView * bv)
-{
- inset.toggleInsetCursor(bv);
+ inset.getCursor(bv, x, y);
}
-void InsetCollapsable::showInsetCursor(BufferView * bv, bool show)
-{
- inset.showInsetCursor(bv, show);
-}
-
-
-void InsetCollapsable::hideInsetCursor(BufferView * bv)
+void InsetCollapsable::getCursorPos(BufferView * bv, int & x, int & y) const
{
- inset.hideInsetCursor(bv);
+ inset.getCursorPos(bv, x , y);
}
}
-bool InsetCollapsable::doClearArea() const
-{
- return inset.doClearArea();
-}
-
-
LyXText * InsetCollapsable::getLyXText(BufferView const * bv,
bool const recursive) const
{
}
-Paragraph * InsetCollapsable::firstParagraph() const
-{
- return inset.firstParagraph();
-}
-
-
-Paragraph * InsetCollapsable::getFirstParagraph(int i) const
+ParagraphList * InsetCollapsable::getParagraphs(int i) const
{
- return inset.getFirstParagraph(i);
+ return inset.getParagraphs(i);
}
if (!collapsed_) return;
collapsed_ = false;
- bv->updateInset(this, false);
+ bv->updateInset(this);
}
return;
collapsed_ = true;
- bv->updateInset(const_cast<InsetCollapsable *>(this), false);
+ bv->updateInset(const_cast<InsetCollapsable *>(this));
}
projects / lyx.git / blobdiff