*
* LyX, The Document Processor
*
- * Copyright (C) 1998 The LyX Team.
+ * Copyright 1998-2001 The LyX Team.
*
* ======================================================
*/
#include "insets/insettext.h"
#include "support/LOstream.h"
#include "support/lstrings.h"
+#include "debug.h"
+#include "lyxtext.h"
class LyXText;
using std::ostream;
+using std::endl;
+using std::max;
InsetCollapsable::InsetCollapsable()
- : UpdatableInset()
+ : UpdatableInset(), inset(new InsetText)
{
- inset = new InsetText;
+ //inset = new InsetText;
inset->setOwner(this);
collapsed = true;
label = "Label";
}
-Inset * InsetCollapsable::Clone() const
+Inset * InsetCollapsable::Clone(Buffer const &) const
{
InsetCollapsable * result = new InsetCollapsable();
result->inset->init(inset);
}
+bool InsetCollapsable::InsertInset(BufferView * bv, Inset * in)
+{
+ if (!InsertInsetAllowed(in)) {
+ lyxerr << "InsetCollapsable::InsertInset: "
+ "Unable to insert inset." << endl;
+ return false;
+ }
+
+ return inset->InsertInset(bv, in);
+}
+
+
void InsetCollapsable::Write(Buffer const * buf, ostream & os) const
{
os << "collapsed " << tostr(collapsed) << "\n";
{
if (lex.IsOK()) {
lex.next();
- string token = lex.GetString();
+ string const token = lex.GetString();
if (token == "collapsed") {
lex.next();
collapsed = lex.GetBool();
+ } else {
+ lyxerr << "InsetCollapsable::Read: Missing collapsed!"
+ << endl;
}
}
inset->Read(buf, lex);
int InsetCollapsable::ascent_collapsed(Painter & pain, LyXFont const &) const
{
- int width = 0, ascent = 0, descent = 0;
- pain.buttonText(0, 0, label.c_str(), labelfont, false,
+ int width = 0;
+ int ascent = 0;
+ int descent = 0;
+ pain.buttonText(0, 0, label, labelfont, false,
width, ascent, descent);
return ascent;
}
int InsetCollapsable::descent_collapsed(Painter & pain, LyXFont const &) const
{
- int width = 0, ascent = 0, descent = 0;
- pain.buttonText(0, 0, label.c_str(), labelfont, false,
+ int width = 0;
+ int ascent = 0;
+ int descent = 0;
+ pain.buttonText(0, 0, label, labelfont, false,
width, ascent, descent);
return descent;
}
int InsetCollapsable::width_collapsed(Painter & pain, LyXFont const &) const
{
- int width, ascent, descent;
- pain.buttonText(TEXT_TO_INSET_OFFSET, 0, label.c_str(), labelfont, false,
+ int width;
+ int ascent;
+ int descent;
+ pain.buttonText(TEXT_TO_INSET_OFFSET, 0, label, labelfont, false,
width, ascent, descent);
return width + (2*TEXT_TO_INSET_OFFSET);
}
-int InsetCollapsable::ascent(Painter & pain, LyXFont const & font) const
+int InsetCollapsable::ascent(BufferView * bv, LyXFont const & font) const
{
if (collapsed)
- return ascent_collapsed(pain, font);
+ return ascent_collapsed(bv->painter(), font);
else
- return inset->ascent(pain, font) + TEXT_TO_TOP_OFFSET;
+ return inset->ascent(bv, font) + TEXT_TO_TOP_OFFSET;
}
-int InsetCollapsable::descent(Painter & pain, LyXFont const & font) const
+int InsetCollapsable::descent(BufferView * bv, LyXFont const & font) const
{
if (collapsed)
- return descent_collapsed(pain, font);
+ return descent_collapsed(bv->painter(), font);
else
- return inset->descent(pain, font) + TEXT_TO_BOTTOM_OFFSET;
+ return inset->descent(bv, font) + TEXT_TO_BOTTOM_OFFSET;
}
-int InsetCollapsable::width(Painter & pain, LyXFont const & font) const
+int InsetCollapsable::width(BufferView * bv, LyXFont const & font) const
{
if (collapsed)
return widthCollapsed;
- return inset->width(pain, font) + widthCollapsed;
+ return inset->width(bv, font) + widthCollapsed;
}
{
int width = 0;
pain.buttonText(int(x) + TEXT_TO_INSET_OFFSET,
- baseline, label.c_str(), labelfont, true, width);
+ baseline, label, labelfont, true, width);
x += width + TEXT_TO_INSET_OFFSET;
}
}
if (!cleared && ((inset->need_update == InsetText::FULL) ||
+ (inset->need_update == InsetText::INIT) ||
(top_x!=int(x)) || (top_baseline!=baseline))) {
- int w = owner()? width(pain, f) : pain.paperWidth();
- int h = ascent(pain,f) + descent(pain, f);
- int tx = (needFullRow() && !owner())? 0:int(x);
- int ty = baseline - ascent(pain,f);
+ int w = owner() ? width(bv, f) : pain.paperWidth();
+ int h = ascent(bv, f) + descent(bv, f);
+ int tx = (needFullRow() && !owner()) ? 0 : int(x);
+ int ty = max(0, baseline - ascent(bv, f));
- if (ty < 0)
- ty = 0;
if ((ty + h) > pain.paperHeight())
h = pain.paperHeight();
if ((top_x + w) > pain.paperWidth())
w = pain.paperWidth();
- pain.fillRectangle(tx, ty-1, w, h+2);
+ if (baseline < 0)
+ h += (baseline - ascent(bv, f));
+ pain.fillRectangle(tx, ty - 1, w, h + 2);
cleared = true;
}
} else if (!collapsed) {
if (!bv->lockInset(this))
return;
- inset->Edit(bv, x-widthCollapsed, y, button);
+ inset->Edit(bv, x - widthCollapsed, y, button);
}
}
void InsetCollapsable::InsetButtonPress(BufferView * bv,int x,int y,int button)
{
if (!collapsed && (x >= button_length)) {
- inset->InsetButtonPress(bv, x-widthCollapsed, y, button);
+ inset->InsetButtonPress(bv, x - widthCollapsed, y, button);
}
}
bv->updateInset(this, false);
}
} else if (!collapsed && (x >= button_length) && (y >= button_top_y)) {
- inset->InsetButtonRelease(bv, x-widthCollapsed, y, button);
+ inset->InsetButtonRelease(bv, x - widthCollapsed, y, button);
}
}
}
-int InsetCollapsable::Latex(Buffer const * buf, ostream & os, bool fragile, bool free_spc) const
+int InsetCollapsable::Latex(Buffer const * buf, ostream & os,
+ bool fragile, bool free_spc) const
{
return inset->Latex(buf, os, fragile, free_spc);
}
int InsetCollapsable::getMaxWidth(Painter & pain,
UpdatableInset const * inset) const
{
- int w;
- if (owner())
- w = static_cast<UpdatableInset*>(owner())->getMaxWidth(pain,inset);
- else
- w = pain.paperWidth();
+ int const w = UpdatableInset::getMaxWidth(pain, inset);
- if (w < 0)
+ if (w < 0) {
+ // What does a negative max width signify? (Lgb)
return w;
-
- return w; // - top_x - widthCollapsed;
+ }
+ // should be at least 30 pixels !!!
+ return max(30, w - widthCollapsed);
}
+#if 0
int InsetCollapsable::getMaxTextWidth(Painter & pain,
UpdatableInset const * inset) const
{
return getMaxWidth(pain, inset) - widthCollapsed;
}
+#endif
void InsetCollapsable::update(BufferView * bv, LyXFont const & font,
- bool dodraw)
+ bool reinit)
{
+ if (reinit) {
+ need_update = FULL;
+ if (owner())
+ owner()->update(bv, font, true);
+ return;
+ }
if (!widthCollapsed) {
widthCollapsed = width_collapsed(bv->painter(), font);
- inset->deleteLyXText(bv);
+ inset->resizeLyXText(bv);
need_update = FULL;
if (owner()) {
- owner()->update(bv, font, dodraw);
+ owner()->update(bv, font);
return;
}
}
- if (oldWidth != width(bv->painter(), font)) {
- oldWidth = width(bv->painter(), font);
- inset->deleteLyXText(bv);
+ if (oldWidth != width(bv, font)) {
+ oldWidth = width(bv, font);
+ inset->resizeLyXText(bv);
need_update = FULL;
if (owner()) {
- owner()->update(bv, font, dodraw);
+ owner()->update(bv, font);
return;
}
}
- inset->update(bv, font, dodraw);
+ inset->update(bv, font);
}
+
UpdatableInset::RESULT
-InsetCollapsable::LocalDispatch(BufferView * bv, int action, string const & arg)
+InsetCollapsable::LocalDispatch(BufferView * bv, kb_action action,
+ string const & arg)
{
UpdatableInset::RESULT result = inset->LocalDispatch(bv, action, arg);
if (result == FINISHED)
return result;
}
+
bool InsetCollapsable::LockInsetInInset(BufferView * bv, UpdatableInset * in)
{
if (inset == in)
}
-int InsetCollapsable::InsetInInsetY()
+unsigned int InsetCollapsable::InsetInInsetY()
{
return inset->InsetInInsetY();
}
UpdatableInset * InsetCollapsable::GetLockingInset()
{
- UpdatableInset *in = inset->GetLockingInset();
+ UpdatableInset * in = inset->GetLockingInset();
if (inset == in)
return this;
return in;
}
-void InsetCollapsable::SetFont(BufferView * bv, LyXFont const & font, bool toggleall)
+void InsetCollapsable::SetFont(BufferView * bv,
+ LyXFont const & font, bool toggleall)
{
inset->SetFont(bv, font, toggleall);
}
+
bool InsetCollapsable::doClearArea() const
{
return inset->doClearArea();
}
-LyXText * InsetCollapsable::getLyXText(BufferView * bv) const
+LyXText * InsetCollapsable::getLyXText(BufferView const * bv,
+ bool const recursive) const
{
- return inset->getLyXText(bv);
+ return inset->getLyXText(bv, recursive);
}
-void InsetCollapsable::deleteLyXText(BufferView * bv)
+void InsetCollapsable::deleteLyXText(BufferView * bv, bool recursive) const
{
- inset->deleteLyXText(bv);
+ inset->deleteLyXText(bv, recursive);
}
+
+void InsetCollapsable::resizeLyXText(BufferView * bv) const
+{
+ inset->resizeLyXText(bv);
+ LyXFont font(LyXFont::ALL_SANE);
+ oldWidth = width(bv, font);
+}
projects / lyx.git / blobdiff