* \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 "BufferView.h"
#include "debug.h"
+#include "dimension.h"
#include "gettext.h"
#include "lyxfont.h"
#include "lyxlex.h"
#include "WordLangTuple.h"
#include "funcrequest.h"
#include "buffer.h"
+#include "metricsinfo.h"
#include "frontends/font_metrics.h"
#include "frontends/Painter.h"
#include "support/LAssert.h"
#include "support/LOstream.h"
+using namespace lyx::support;
+using namespace lyx::graphics;
+
using std::vector;
using std::ostream;
using std::endl;
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, bool same_id)
- : UpdatableInset(in, same_id), collapsed_(in.collapsed_),
+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), same_id);
+ 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();
}
-int InsetCollapsable::ascent_collapsed() const
-{
- int width = 0;
- int ascent = 0;
- int descent = 0;
- font_metrics::buttonText(label, labelfont, width, ascent, descent);
- return ascent;
-}
-
-
-int InsetCollapsable::descent_collapsed() const
-{
- int width = 0;
- int ascent = 0;
- int descent = 0;
- font_metrics::buttonText(label, labelfont, width, ascent, descent);
- return descent;
-}
-
-
-//int InsetCollapsable::width_collapsed(Painter & pain) const
-int InsetCollapsable::width_collapsed() const
-{
- int width;
- int ascent;
- int descent;
- font_metrics::buttonText(label, labelfont, width, ascent, descent);
- return width + 2 * TEXT_TO_INSET_OFFSET;
-}
-
-
-int InsetCollapsable::ascent(BufferView * /*bv*/, LyXFont const &) const
+void InsetCollapsable::dimension_collapsed(Dimension & dim) const
{
- return ascent_collapsed();
+ font_metrics::buttonText(label, labelfont, dim.wid, dim.asc, dim.des);
}
-int InsetCollapsable::descent(BufferView * bv, LyXFont const & font) const
+int InsetCollapsable::height_collapsed() const
{
- if (collapsed_)
- return descent_collapsed();
-
- return descent_collapsed()
- + inset.descent(bv, font)
- + inset.ascent(bv, font)
- + TEXT_TO_BOTTOM_OFFSET;
+ Dimension dim;
+ font_metrics::buttonText(label, labelfont, dim.wid, dim.asc, dim.des);
+ return dim.asc + dim.des;
}
-int InsetCollapsable::width(BufferView * bv, LyXFont const & font) const
+void InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
{
- if (collapsed_)
- return width_collapsed();
-
- int const collapsed_width = width_collapsed();
- int const contents_width = inset.width(bv, font);
-
- return max(collapsed_width, contents_width);
+ //lyxerr << "InsetCollapsable::metrics: width: " << mi.base.textwidth << endl;
+ dimension_collapsed(dim);
+ 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(Painter & pain,
- int baseline, float & x) const
+void InsetCollapsable::draw_collapsed(PainterInfo & pi, int x, int y) const
{
- pain.buttonText(int(x) + TEXT_TO_INSET_OFFSET,
- baseline, label, labelfont);
- x += width_collapsed();
+ pi.pain.buttonText(x, y, label, labelfont);
}
-void InsetCollapsable::draw(BufferView * bv, LyXFont const & f,
- int baseline, float & x, bool inlined) const
+void InsetCollapsable::draw(PainterInfo & pi, int x, int y, bool inlined) const
{
- lyx::Assert(bv);
- cache(bv);
-
- if (nodraw())
- return;
+ Assert(pi.base.bv);
+ cache(pi.base.bv);
- Painter & pain = bv->painter();
+ Dimension dim_collapsed;
+ dimension_collapsed(dim_collapsed);
- button_length = width_collapsed();
- button_top_y = -ascent(bv, f);
- button_bottom_y = -ascent(bv, f) + ascent_collapsed() +
- descent_collapsed();
+ 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(pain, baseline, x);
+ draw_collapsed(pi, x, y);
return;
}
- float old_x = x;
+ int old_x = x;
if (!owner())
x += scroll();
- top_x = int(x);
- top_baseline = baseline;
+ top_x = x;
+ top_baseline = y;
- int const bl = baseline - ascent(bv, f) + ascent_collapsed();
+ int const bl = y - aa + dim_collapsed.ascent();
if (inlined) {
- inset.draw(bv, f, baseline, x);
+ inset.draw(pi, x, y);
} else {
- 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;
+ draw_collapsed(pi, old_x, bl);
+ inset.draw(pi, x, bl + dim_collapsed.descent() + inset.ascent());
}
}
-void InsetCollapsable::draw(BufferView * bv, LyXFont const & f,
- int baseline, float & x) const
+void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
{
// by default, we are not inlined-drawing
- draw(bv, f, baseline, x, false);
+ draw(pi, x, y, false);
}
-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 -
- (ascent_collapsed() +
- descent_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,
- bool fragile, bool free_spc) const
+int InsetCollapsable::latex(Buffer const & buf, ostream & os,
+ LatexRunParams const & runparams) const
{
- return inset.latex(buf, os, fragile, free_spc);
+ 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 -
- (ascent_collapsed() +
- descent_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);
-}
-
-
-vector<string> const InsetCollapsable::getLabelList() const
+void InsetCollapsable::getLabelList(std::vector<string> & list) const
{
- return inset.getLabelList();
-}
-
-
-bool InsetCollapsable::nodraw() const
-{
- return inset.nodraw();
+ inset.getLabelList(list);
}
}
-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