* \author Jürgen Vigna
* \author Lars Gullik Bjønnes
*
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
*/
#include <config.h>
#include "support/LOstream.h"
using namespace lyx::support;
+using namespace lyx::graphics;
using std::vector;
using std::ostream;
InsetCollapsable::InsetCollapsable(BufferParams const & bp, bool collapsed)
: UpdatableInset(), collapsed_(collapsed), inset(bp),
- button_length(0), button_top_y(0), button_bottom_y(0),
- label("Label"),
+ button_dim(0, 0, 0, 0), label("Label"),
#if 0
autocollapse(false),
#endif
- oldWidth(0), in_update(false), first_after_edit(false)
+ in_update(false), first_after_edit(false)
{
inset.setOwner(this);
inset.setAutoBreakRows(true);
- inset.setDrawFrame(0, InsetText::ALWAYS);
- inset.setFrameColor(0, LColor::collapsableframe);
+ inset.setDrawFrame(InsetText::ALWAYS);
+ inset.setFrameColor(LColor::collapsableframe);
setInsetName("Collapsable");
}
InsetCollapsable::InsetCollapsable(InsetCollapsable const & in)
: UpdatableInset(in), collapsed_(in.collapsed_),
framecolor(in.framecolor), labelfont(in.labelfont), inset(in.inset),
- button_length(0), button_top_y(0), button_bottom_y(0),
- label(in.label),
+ button_dim(0, 0, 0, 0), label(in.label),
#if 0
autocollapse(in.autocollapse),
#endif
- oldWidth(0), in_update(false), first_after_edit(false)
+ in_update(false), first_after_edit(false)
{
inset.init(&(in.inset));
inset.setOwner(this);
}
-bool InsetCollapsable::insertInset(BufferView * bv, Inset * in)
+bool InsetCollapsable::insertInset(BufferView * bv, InsetOld * in)
{
if (!insetAllowed(in->lyxCode())) {
lyxerr << "InsetCollapsable::InsertInset: "
}
-void InsetCollapsable::write(Buffer const * buf, ostream & os) const
+void InsetCollapsable::write(Buffer const & buf, ostream & os) const
{
os << "collapsed " << (collapsed_ ? "true" : "false") << "\n";
inset.writeParagraphData(buf, os);
}
-void InsetCollapsable::read(Buffer const * buf, LyXLex & lex)
+void InsetCollapsable::read(Buffer const & buf, LyXLex & lex)
{
if (lex.isOK()) {
lex.next();
void InsetCollapsable::dimension_collapsed(Dimension & dim) const
{
font_metrics::buttonText(label, labelfont, dim.wid, dim.asc, dim.des);
- dim.wid += 2 * TEXT_TO_INSET_OFFSET;
}
void InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
{
+ //lyxerr << "InsetCollapsable::metrics: width: " << mi.base.textwidth << endl;
dimension_collapsed(dim);
- if (collapsed_)
- return;
- Dimension insetdim;
- inset.metrics(mi, insetdim);
- dim.des += insetdim.height() + TEXT_TO_BOTTOM_OFFSET;
- dim.wid = max(dim.wid, insetdim.wid);
+ if (!collapsed_) {
+ Dimension insetdim;
+ inset.metrics(mi, insetdim);
+ dim.des += insetdim.height() + TEXT_TO_BOTTOM_OFFSET;
+ dim.wid = max(dim.wid, insetdim.wid);
+ }
+ dim_ = dim;
}
void InsetCollapsable::draw_collapsed(PainterInfo & pi, int x, int y) const
{
- pi.pain.buttonText(x + TEXT_TO_INSET_OFFSET, y, label, labelfont);
+ pi.pain.buttonText(x, y, label, labelfont);
}
Assert(pi.base.bv);
cache(pi.base.bv);
- if (nodraw())
- return;
-
Dimension dim_collapsed;
dimension_collapsed(dim_collapsed);
- int const aa = ascent(pi.base.bv, pi.base.font);
- button_length = dim_collapsed.width();
- button_top_y = -aa;
- button_bottom_y = -aa + dim_collapsed.height();
+ int const aa = ascent();
+ button_dim.x1 = 0;
+ button_dim.x2 = dim_collapsed.width();
+ button_dim.y1 = -aa;
+ button_dim.y2 = -aa + dim_collapsed.height();
if (!isOpen()) {
draw_collapsed(pi, x, y);
inset.draw(pi, x, y);
} else {
draw_collapsed(pi, old_x, bl);
- int const yy = bl + dim_collapsed.descent()
- + inset.ascent(pi.base.bv, pi.base.font);
- inset.draw(pi, x, yy);
+ inset.draw(pi, x, bl + dim_collapsed.descent() + inset.ascent());
}
}
}
-Inset::EDITABLE InsetCollapsable::editable() const
+InsetOld::EDITABLE InsetCollapsable::editable() const
{
return collapsed_ ? IS_EDITABLE : HIGHLY_EDITABLE;
}
FuncRequest InsetCollapsable::adjustCommand(FuncRequest const & cmd)
{
- LyXFont font(LyXFont::ALL_SANE);
FuncRequest cmd1 = cmd;
- cmd1.y = ascent(cmd.view(), font) + cmd.y -
- (height_collapsed() + inset.ascent(cmd.view(), font));
+ cmd1.y = ascent() + cmd.y - (height_collapsed() + inset.ascent());
return cmd1;
}
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 (cmd.button() != mouse_button::button3 && hitButton(cmd)) {
if (collapsed_) {
collapsed_ = false;
- inset.setUpdateStatus(bv, InsetText::FULL);
- bv->updateInset(this);
- bv->buffer()->markDirty();
} else {
collapsed_ = true;
bv->unlockInset(this);
- bv->updateInset(this);
- bv->buffer()->markDirty();
}
- } else if (!collapsed_ && (cmd.y > button_bottom_y)) {
- ret = (inset.localDispatch(adjustCommand(cmd)) == DISPATCHED);
+ 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);
}
-int InsetCollapsable::latex(Buffer const * buf, ostream & os,
+int InsetCollapsable::latex(Buffer const & buf, ostream & os,
LatexRunParams const & runparams) const
{
return inset.latex(buf, os, runparams);
}
-int InsetCollapsable::ascii(Buffer const * buf, ostream & os, int ll) const
+int InsetCollapsable::ascii(Buffer const & buf, ostream & os, int ll) const
{
return inset.ascii(buf, os, ll);
}
-int InsetCollapsable::linuxdoc(Buffer const * buf, ostream & os) const
+int InsetCollapsable::linuxdoc(Buffer const & buf, ostream & os) const
{
return inset.linuxdoc(buf, os);
}
-int InsetCollapsable::docbook(Buffer const * buf, ostream & os, bool mixcont) const
+int InsetCollapsable::docbook(Buffer const & buf, ostream & os, bool mixcont) const
{
return inset.docbook(buf, os, mixcont);
}
-void InsetCollapsable::update(BufferView * bv, bool reinit)
+bool InsetCollapsable::hitButton(FuncRequest const & cmd) const
{
- if (in_update) {
- if (reinit && owner()) {
- owner()->update(bv, true);
- }
- return;
- }
- in_update = true;
- inset.update(bv, reinit);
- if (reinit && owner()) {
- owner()->update(bv, true);
- }
- in_update = false;
+ return button_dim.contained(cmd.x, cmd.y);
}
-Inset::RESULT InsetCollapsable::localDispatch(FuncRequest const & cmd)
+InsetOld::RESULT InsetCollapsable::localDispatch(FuncRequest const & cmd)
{
- //lyxerr << "InsetCollapsable::localDispatch: " << cmd.action << "\n";
+ //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)) {
- inset.setUpdateStatus(bv, InsetText::FULL);
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);
}
FuncRequest cmd1 = cmd;
if (!bv->lockInset(this))
return DISPATCHED;
- if (cmd.y <= button_bottom_y) {
+ if (cmd.y <= button_dim.y2) {
cmd1.y = 0;
} else {
- LyXFont font(LyXFont::ALL_SANE);
- cmd1.y = ascent(bv, font) + cmd.y -
- (height_collapsed() + inset.ascent(bv, font));
+ cmd1.y = ascent() + cmd.y - (height_collapsed() + inset.ascent());
}
inset.localDispatch(cmd);
}
}
case LFUN_MOUSE_PRESS:
- if (!collapsed_ && cmd.y > button_bottom_y)
+ if (!collapsed_ && cmd.y > button_dim.y2)
inset.localDispatch(adjustCommand(cmd));
return DISPATCHED;
case LFUN_MOUSE_MOTION:
- if (!collapsed_ && cmd.y > button_bottom_y)
+ if (!collapsed_ && cmd.y > button_dim.y2)
inset.localDispatch(adjustCommand(cmd));
return DISPATCHED;
}
-bool InsetCollapsable::updateInsetInInset(BufferView * bv, Inset *in)
-{
- if (in == this)
- return true;
- return inset.updateInsetInInset(bv, in);
-}
-
-
int InsetCollapsable::insetInInsetY() const
{
return inset.insetInInsetY() - (top_baseline - inset.y());
UpdatableInset * InsetCollapsable::getLockingInset() const
{
UpdatableInset * in = inset.getLockingInset();
- if (const_cast<InsetText *>(&inset) == in)
+ if (&inset == in)
return const_cast<InsetCollapsable *>(this);
return in;
}
-UpdatableInset * InsetCollapsable::getFirstLockingInsetOfType(Inset::Code c)
+UpdatableInset * InsetCollapsable::getFirstLockingInsetOfType(InsetOld::Code c)
{
if (c == lyxCode())
return this;
}
-void InsetCollapsable::resizeLyXText(BufferView * bv, bool force) const
-{
- inset.resizeLyXText(bv, force);
- LyXFont font(LyXFont::ALL_SANE);
- oldWidth = width(bv, font);
-}
-
-
void InsetCollapsable::getLabelList(std::vector<string> & list) const
{
inset.getLabelList(list);
}
-bool InsetCollapsable::nodraw() const
-{
- return inset.nodraw();
-}
-
-
int InsetCollapsable::scroll(bool recursive) const
{
int sx = UpdatableInset::scroll(false);
}
-Inset * InsetCollapsable::getInsetFromID(int id_arg) const
+InsetOld * InsetCollapsable::getInsetFromID(int id_arg) const
{
if (id_arg == id())
return const_cast<InsetCollapsable *>(this);
void InsetCollapsable::open(BufferView * bv)
{
- if (!collapsed_) return;
+ if (!collapsed_)
+ return;
collapsed_ = false;
bv->updateInset(this);
return;
collapsed_ = true;
- bv->updateInset(const_cast<InsetCollapsable *>(this));
+ bv->updateInset(this);
}
}
-void InsetCollapsable::addPreview(grfx::PreviewLoader & loader) const
+void InsetCollapsable::addPreview(PreviewLoader & loader) const
{
inset.addPreview(loader);
}
projects / lyx.git / blobdiff