#include <config.h>
#include "insetcollapsable.h"
-#include "insettext.h"
+#include "buffer.h"
#include "BufferView.h"
+#include "cursor.h"
#include "debug.h"
-#include "dimension.h"
-#include "gettext.h"
-#include "lyxfont.h"
+#include "dispatchresult.h"
+#include "LColor.h"
#include "lyxlex.h"
-#include "lyxtext.h"
-#include "WordLangTuple.h"
#include "funcrequest.h"
-#include "buffer.h"
#include "metricsinfo.h"
+#include "paragraph.h"
#include "frontends/font_metrics.h"
#include "frontends/Painter.h"
#include "frontends/LyXView.h"
-#include "support/LAssert.h"
-#include "support/LOstream.h"
-using namespace lyx::support;
-using namespace lyx::graphics;
+using lyx::graphics::PreviewLoader;
-using std::vector;
-using std::ostream;
using std::endl;
+using std::string;
using std::max;
+using std::ostream;
InsetCollapsable::InsetCollapsable(BufferParams const & bp, bool collapsed)
- : UpdatableInset(), collapsed_(collapsed), inset(bp),
- button_dim(0, 0, 0, 0), label("Label"),
+ : UpdatableInset(), inset(bp), collapsed_(collapsed), label("Label")
#if 0
- autocollapse(false),
+ ,autocollapse(false)
#endif
- in_update(false), first_after_edit(false)
{
inset.setOwner(this);
inset.setAutoBreakRows(true);
InsetCollapsable::InsetCollapsable(InsetCollapsable const & in)
- : UpdatableInset(in), collapsed_(in.collapsed_),
- framecolor(in.framecolor), labelfont(in.labelfont), inset(in.inset),
- button_dim(0, 0, 0, 0), label(in.label),
+ : UpdatableInset(in), inset(in.inset), collapsed_(in.collapsed_),
+ labelfont_(in.labelfont_), label(in.label)
#if 0
- autocollapse(in.autocollapse),
+ ,autocollapse(in.autocollapse)
#endif
- in_update(false), first_after_edit(false)
{
- inset.init(&(in.inset));
inset.setOwner(this);
}
void InsetCollapsable::dimension_collapsed(Dimension & dim) const
{
- font_metrics::buttonText(label, labelfont, dim.wid, dim.asc, dim.des);
+ font_metrics::buttonText(label, labelfont_, dim.wid, dim.asc, dim.des);
}
int InsetCollapsable::height_collapsed() const
{
Dimension dim;
- font_metrics::buttonText(label, labelfont, dim.wid, dim.asc, dim.des);
+ font_metrics::buttonText(label, labelfont_, dim.wid, dim.asc, dim.des);
return dim.asc + dim.des;
}
dim.wid = max(dim.wid, insetdim.wid);
}
dim_ = dim;
+ //lyxerr << "InsetCollapsable::metrics: dim.wid: " << dim.wid << endl;
}
void InsetCollapsable::draw_collapsed(PainterInfo & pi, int x, int y) const
{
- pi.pain.buttonText(x, y, label, labelfont);
+ pi.pain.buttonText(x, y, label, labelfont_);
}
void InsetCollapsable::draw(PainterInfo & pi, int x, int y, bool inlined) const
{
- Assert(pi.base.bv);
- cache(pi.base.bv);
-
Dimension dim_collapsed;
dimension_collapsed(dim_collapsed);
top_x = x;
top_baseline = y;
- int const bl = y - aa + dim_collapsed.ascent();
-
if (inlined) {
inset.draw(pi, x, y);
} else {
+ int const bl = y - aa + dim_collapsed.ascent();
draw_collapsed(pi, old_x, bl);
inset.draw(pi, x, bl + dim_collapsed.descent() + inset.ascent());
}
}
-void InsetCollapsable::insetUnlock(BufferView * bv)
-{
-#if 0
- if (autocollapse) {
- if (change_label_with_text) {
- draw_label = get_new_label();
- } else {
- draw_label = label;
- }
- collapsed_ = true;
- }
-#endif
- inset.insetUnlock(bv);
- if (scroll())
- scroll(bv, 0.0F);
- bv->updateInset(this);
-}
-
-
FuncRequest InsetCollapsable::adjustCommand(FuncRequest const & cmd)
{
FuncRequest cmd1 = cmd;
- cmd1.y = ascent() + cmd.y - (height_collapsed() + inset.ascent());
+ cmd1.y = ascent() + cmd.y - height_collapsed() - inset.ascent();
return cmd1;
}
-void InsetCollapsable::lfunMouseRelease(FuncRequest const & cmd)
+DispatchResult InsetCollapsable::lfunMouseRelease(FuncRequest const & cmd)
{
- bool ret = false;
+ DispatchResult result(true, true);
BufferView * bv = cmd.view();
- if (collapsed_ && cmd.button() != mouse_button::button3) {
- collapsed_ = false;
- bv->updateInset(this);
- bv->buffer()->markDirty();
- return;
- }
-
- if (cmd.button() != mouse_button::button3 && hitButton(cmd)) {
+ if (cmd.button() == mouse_button::button3) {
+ lyxerr << "InsetCollapsable::lfunMouseRelease 0" << endl;
+ if (hitButton(cmd))
+ showInsetDialog(bv);
+ } else {
if (collapsed_) {
+ lyxerr << "InsetCollapsable::lfunMouseRelease 1" << endl;
collapsed_ = false;
- } else {
- collapsed_ = true;
- bv->unlockInset(this);
+ bv->updateInset(this);
+ bv->buffer()->markDirty();
+ return result;
+ }
+
+ if (hitButton(cmd)) {
+ if (collapsed_) {
+ lyxerr << "InsetCollapsable::lfunMouseRelease 2" << endl;
+ collapsed_ = false;
+ } else {
+ collapsed_ = true;
+ result.update(true);
+ result.val(FINISHED_RIGHT);
+ return result;
+ }
+ result.update(true);
+ bv->updateInset(this);
+ bv->buffer()->markDirty();
+ } else if (!collapsed_ && cmd.y > button_dim.y2) {
+ lyxerr << "InsetCollapsable::lfunMouseRelease 3" << endl;
+ result = inset.dispatch(adjustCommand(cmd));
}
- bv->updateInset(this);
- bv->buffer()->markDirty();
- lyxerr << "InsetCollapsable::lfunMouseRelease\n";
- } else if (!collapsed_ && cmd.y > button_dim.y2) {
- ret = inset.localDispatch(adjustCommand(cmd)) == DISPATCHED;
}
- if (cmd.button() == mouse_button::button3 && !ret)
- showInsetDialog(bv);
+ lyxerr << "InsetCollapsable::lfunMouseRelease 4" << endl;
+ return result;
}
int InsetCollapsable::latex(Buffer const & buf, ostream & os,
- LatexRunParams const & runparams) const
+ OutputParams const & runparams) const
{
return inset.latex(buf, os, runparams);
}
-int InsetCollapsable::ascii(Buffer const & buf, ostream & os, int ll) const
+int InsetCollapsable::plaintext(Buffer const & buf, ostream & os,
+ OutputParams const & runparams) const
{
- return inset.ascii(buf, os, ll);
+ return inset.plaintext(buf, os, runparams);
}
-int InsetCollapsable::linuxdoc(Buffer const & buf, ostream & os) const
+int InsetCollapsable::linuxdoc(Buffer const & buf, ostream & os,
+ OutputParams const & runparams) const
{
- return inset.linuxdoc(buf, os);
+ return inset.linuxdoc(buf, os, runparams);
}
-int InsetCollapsable::docbook(Buffer const & buf, ostream & os, bool mixcont) const
+int InsetCollapsable::docbook(Buffer const & buf, ostream & os,
+ OutputParams const & runparams) const
{
- return inset.docbook(buf, os, mixcont);
+ return inset.docbook(buf, os, runparams);
}
bool InsetCollapsable::hitButton(FuncRequest const & cmd) const
{
- return button_dim.contained(cmd.x, cmd.y);
+ return button_dim.contains(cmd.x, cmd.y);
}
-InsetOld::RESULT InsetCollapsable::localDispatch(FuncRequest const & cmd)
+void InsetCollapsable::edit(BufferView * bv, bool left)
{
- //lyxerr << "InsetCollapsable::localDispatch: "
- // << cmd.action << " '" << cmd.argument << "'\n";
- BufferView * bv = cmd.view();
- switch (cmd.action) {
- case LFUN_INSET_EDIT: {
- if (!cmd.argument.empty()) {
- UpdatableInset::localDispatch(cmd);
- if (collapsed_) {
- lyxerr << "branch collapsed_" << endl;
- collapsed_ = false;
- if (bv->lockInset(this)) {
- bv->updateInset(this);
- bv->buffer()->markDirty();
- inset.localDispatch(cmd);
- first_after_edit = true;
- }
- } else {
- lyxerr << "branch not collapsed_" << endl;
- if (bv->lockInset(this))
- inset.localDispatch(cmd);
- }
- return DISPATCHED;
- }
+ lyxerr << "InsetCollapsable: edit left/right" << endl;
+ bv->cursor().push(this);
+ inset.edit(bv, left);
+ open(bv);
+}
-#ifdef WITH_WARNINGS
-#warning Fix this properly in BufferView_pimpl::workAreaButtonRelease
-#endif
- if (cmd.button() == mouse_button::button3)
- return DISPATCHED;
- UpdatableInset::localDispatch(cmd);
+void InsetCollapsable::edit(BufferView * bv, int x, int y)
+{
+ lyxerr << "InsetCollapsable: edit xy" << endl;
+ if (collapsed_) {
+ collapsed_ = false;
+ // set this only here as it should be recollapsed only if
+ // it was already collapsed!
+ bv->updateInset(this);
+ bv->buffer()->markDirty();
+ inset.edit(bv, x, y);
+ } else {
+ if (y <= button_dim.y2)
+ inset.edit(bv, x, 0);
+ else
+ inset.edit(bv, x,
+ ascent() + y - height_collapsed() + inset.ascent());
+ }
+ bv->cursor().push(this);
+}
- 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_dim.y2) {
- cmd1.y = 0;
- } else {
- cmd1.y = ascent() + cmd.y - (height_collapsed() + inset.ascent());
- }
- inset.localDispatch(cmd);
- }
- return DISPATCHED;
- }
+DispatchResult
+InsetCollapsable::priv_dispatch(FuncRequest const & cmd, idx_type &, pos_type &)
+{
+ lyxerr << "\nInsetCollapsable::priv_dispatch (begin): cmd: " << cmd
+ << " button y: " << button_dim.y2 << endl;
+ switch (cmd.action) {
case LFUN_MOUSE_PRESS:
if (!collapsed_ && cmd.y > button_dim.y2)
- inset.localDispatch(adjustCommand(cmd));
- return DISPATCHED;
+ inset.dispatch(adjustCommand(cmd));
+ return DispatchResult(true, true);
case LFUN_MOUSE_MOTION:
if (!collapsed_ && cmd.y > button_dim.y2)
- inset.localDispatch(adjustCommand(cmd));
- return DISPATCHED;
+ inset.dispatch(adjustCommand(cmd));
+ return DispatchResult(true, true);
case LFUN_MOUSE_RELEASE:
- lfunMouseRelease(cmd);
- return DISPATCHED;
+ if (!collapsed_ && cmd.y > button_dim.y2)
+ inset.dispatch(adjustCommand(cmd));
+ else
+ return lfunMouseRelease(cmd);
+ return DispatchResult(true, true);
default:
- UpdatableInset::RESULT result = inset.localDispatch(cmd);
- if (result >= FINISHED)
- bv->unlockInset(this);
- first_after_edit = false;
- return result;
- }
-}
-
-
-bool InsetCollapsable::lockInsetInInset(BufferView * bv, UpdatableInset * in)
-{
- if (&inset == in)
- return true;
- return inset.lockInsetInInset(bv, in);
-}
-
-
-bool InsetCollapsable::unlockInsetInInset(BufferView * bv, UpdatableInset * in,
- bool lr)
-{
- if (&inset == in) {
- bv->unlockInset(this);
- return true;
+ return inset.dispatch(cmd);
}
- return inset.unlockInsetInInset(bv, in, lr);
+ lyxerr << "InsetCollapsable::priv_dispatch (end)" << endl;
}
int InsetCollapsable::insetInInsetY() const
{
- return inset.insetInInsetY() - (top_baseline - inset.y());
+ return inset.y() - top_baseline + inset.insetInInsetY();
}
}
-void InsetCollapsable::getCursor(BufferView & bv, int & x, int & y) const
-{
- inset.getCursor(bv, x, y);
-}
-
-
void InsetCollapsable::getCursorPos(BufferView * bv, int & x, int & y) const
{
inset.getCursorPos(bv, x , y);
-}
-
-
-UpdatableInset * InsetCollapsable::getLockingInset() const
-{
- UpdatableInset * in = inset.getLockingInset();
- if (&inset == in)
- return const_cast<InsetCollapsable *>(this);
- return in;
-}
-
-
-UpdatableInset * InsetCollapsable::getFirstLockingInsetOfType(InsetOld::Code c)
-{
- if (c == lyxCode())
- return this;
- return inset.getFirstLockingInsetOfType(c);
+ y += - ascent() + height_collapsed() + inset.ascent();
}
}
-LyXText * InsetCollapsable::getLyXText(BufferView const * bv,
- bool const recursive) const
-{
- return inset.getLyXText(bv, recursive);
-}
-
-
void InsetCollapsable::deleteLyXText(BufferView * bv, bool recursive) const
{
inset.deleteLyXText(bv, recursive);
}
-void InsetCollapsable::getLabelList(std::vector<string> & list) const
+void InsetCollapsable::getLabelList(Buffer const & buffer,
+ std::vector<string> & list) const
{
- inset.getLabelList(list);
+ inset.getLabelList(buffer, list);
}
}
-LyXCursor const & InsetCollapsable::cursor(BufferView * bv) const
+int InsetCollapsable::numParagraphs() const
{
- return inset.cursor(bv);
+ return inset.numParagraphs();
}
-InsetOld * InsetCollapsable::getInsetFromID(int id_arg) const
+LyXText * InsetCollapsable::getText(int i) const
{
- if (id_arg == id())
- return const_cast<InsetCollapsable *>(this);
- return inset.getInsetFromID(id_arg);
+ return inset.getText(i);
}
}
+void InsetCollapsable::setCollapsed(bool c) const
+{
+ collapsed_ = c;
+}
+
+
void InsetCollapsable::markErased()
{
inset.markErased();
}
-bool InsetCollapsable::nextChange(BufferView * bv, lyx::pos_type & length)
+void InsetCollapsable::addPreview(PreviewLoader & loader) const
{
- bool found = inset.nextChange(bv, length);
+ inset.addPreview(loader);
+}
+
- if (first_after_edit && !found)
- close(bv);
- else if (!found)
- first_after_edit = false;
- return found;
+bool InsetCollapsable::insetAllowed(InsetOld::Code code) const
+{
+ return inset.insetAllowed(code);
}
-bool InsetCollapsable::searchForward(BufferView * bv, string const & str,
- bool cs, bool mw)
+void InsetCollapsable::fitInsetCursor(BufferView * bv) const
{
- bool found = inset.searchForward(bv, str, cs, mw);
- if (first_after_edit && !found)
- close(bv);
- else if (!found)
- first_after_edit = false;
- return found;
+ inset.fitInsetCursor(bv);
}
-bool InsetCollapsable::searchBackward(BufferView * bv, string const & str,
- bool cs, bool mw)
+void InsetCollapsable::setLabelFont(LyXFont & f)
{
- bool found = inset.searchBackward(bv, str, cs, mw);
- if (first_after_edit && !found)
- close(bv);
- else if (!found)
- first_after_edit = false;
- return found;
+ labelfont_ = f;
}
+#if 0
+void InsetCollapsable::setAutoCollapse(bool f)
+{
+ autocollapse = f;
+}
+#endif
-WordLangTuple const
-InsetCollapsable::selectNextWordToSpellcheck(BufferView * bv, float & value) const
+void InsetCollapsable::scroll(BufferView *bv, float sx) const
{
- WordLangTuple word = inset.selectNextWordToSpellcheck(bv, value);
- if (first_after_edit && word.word().empty())
- close(bv);
- first_after_edit = false;
- return word;
+ UpdatableInset::scroll(bv, sx);
}
-void InsetCollapsable::addPreview(PreviewLoader & loader) const
+void InsetCollapsable::scroll(BufferView *bv, int offset) const
{
- inset.addPreview(loader);
+ UpdatableInset::scroll(bv, offset);
}
-void InsetCollapsable::cache(BufferView * bv) const
+bool InsetCollapsable::isOpen() const
{
- view_ = bv->owner()->view();
+ return !collapsed_;
}
-BufferView * InsetCollapsable::view() const
+Box const & InsetCollapsable::buttonDim() const
{
- return view_.lock().get();
+ return button_dim;
}
+
projects / lyx.git / blobdiff