InsetText::InsetText(BufferParams const & bp)
- : autoBreakRows_(false), drawFrame_(NEVER),
+ : autoBreakRows_(false), drawFrame_(false),
frame_color_(LColor::insetframe), text_(0)
{
paragraphs().push_back(Paragraph());
}
+InsetText::InsetText() : text_(0)
+{}
+
+
void InsetText::operator=(InsetText const & in)
{
UpdatableInset::operator=(in);
for (; pit != end; ++pit)
pit->setInsetOwner(this);
old_par = -1;
- in_insetAllowed = false;
}
{
clear(false);
+#ifdef WITH_WARNINGS
#warning John, look here. Doesnt make much sense.
+#endif
if (buf.params().tracking_changes)
paragraphs().begin()->trackChanges();
{
//lyxerr << "InsetText::metrics: width: " << mi.base.textwidth << endl;
setViewCache(mi.base.bv);
- mi.base.textwidth -= 2 * TEXT_TO_INSET_OFFSET;
text_.metrics(mi, dim);
- dim.asc += TEXT_TO_INSET_OFFSET;
- dim.des += TEXT_TO_INSET_OFFSET;
- dim.wid += 2 * TEXT_TO_INSET_OFFSET;
- mi.base.textwidth += 2 * TEXT_TO_INSET_OFFSET;
dim_ = dim;
font_ = mi.base.font;
text_.font_ = mi.base.font;
// update our idea of where we are
setPosCache(pi, x, y);
- // repaint the background if needed
- x += TEXT_TO_INSET_OFFSET;
- if (backgroundColor() != LColor::background)
- clearInset(pi.pain, x, y);
-
BufferView * bv = pi.base.bv;
bv->hideCursor();
- if (!owner())
- x += scroll();
- y += bv->top_y() - text_.ascent();
+ x += scroll();
+ y -= text_.ascent();
- text_.draw(pi, x, y);
+ // repaint the background if needed
+ if (backgroundColor() != LColor::background)
+ clearInset(pi.pain, x, y);
- if (drawFrame_ == ALWAYS || drawFrame_ == LOCKED)
- drawFrame(pi.pain, xo_, yo_ - bv->top_y());
+ text_.draw(pi, x, y + bv->top_y());
+
+ if (drawFrame_)
+ drawFrame(pi.pain, x, y);
}
void InsetText::drawFrame(Painter & pain, int x, int y) const
{
- int const ttoD2 = TEXT_TO_INSET_OFFSET / 2;
- int const frame_x = x + ttoD2;
- int const frame_y = y - dim_.asc + ttoD2;
- int const frame_w = dim_.wid - TEXT_TO_INSET_OFFSET;
- int const frame_h = dim_.asc + dim_.des - TEXT_TO_INSET_OFFSET;
- pain.rectangle(frame_x, frame_y, frame_w, frame_h, frameColor());
+ int const w = text_.width();
+ int const h = text_.height();
+ pain.rectangle(x, y, w, h, frameColor());
+}
+
+
+void InsetText::clearInset(Painter & pain, int x, int y) const
+{
+ int const w = text_.width();
+ int const h = text_.height();
+ pain.fillRectangle(x, y, w, h, backgroundColor());
}
}
cur.clearSelection();
- mergeParagraph(cur.bv().buffer()->params(), paragraphs(), first);
+ mergeParagraph(cur.buffer().params(), paragraphs(), 0);
}
}
LyXView * lv = cur.bv().owner();
lv->view_state_changed();
lv->updateMenubar();
- lv->updateToolbar();
+ lv->updateToolbars();
if (old_par != cur.par()) {
- lv->setLayout(text_.getPar(cur.par())->layout()->name());
+ lv->setLayout(text_.getPar(cur.par()).layout()->name());
old_par = cur.par();
}
}
}
-void InsetText::sanitizeEmptyText(BufferView & bv)
-{
- if (paragraphs().size() == 1
- && paragraphs().begin()->empty()
- && bv.getParentLanguage(this) != text_.current_font.language()) {
- LyXFont font(LyXFont::ALL_IGNORE);
- font.setLanguage(bv.getParentLanguage(this));
- text_.setFont(bv.cursor(), font, false);
- }
-}
-
-
void InsetText::edit(LCursor & cur, bool left)
{
//lyxerr << "InsetText: edit left/right" << endl;
text_.setCursor(cur.top(), par, pos);
cur.clearSelection();
finishUndo();
- sanitizeEmptyText(cur.bv());
- updateLocal(cur);
+#ifdef WITH_WARNINGS
+#warning can someone check if/when this is needed?
+#endif
+//Andre?
+// updateLocal(cur);
}
-InsetBase * InsetText::editXY(LCursor & cur, int x, int y)
+InsetBase * InsetText::editXY(LCursor & cur, int x, int y) const
{
- lyxerr << "InsetText::edit xy" << endl;
old_par = -1;
return text_.editXY(cur, x, y);
//sanitizeEmptyText(cur.bv());
void InsetText::priv_dispatch(LCursor & cur, FuncRequest & cmd)
{
- //lyxerr << "InsetText::priv_dispatch (begin), act: "
- // << cmd.action << " " << endl;
-
+ //lyxerr << "InsetText::priv_dispatch: " << cmd.action << " " << endl;
setViewCache(&cur.bv());
bool was_empty = paragraphs().begin()->empty() && paragraphs().size() == 1;
text_.dispatch(cur, cmd);
- // If the action has deleted all text in the inset, we need
- // to change the language to the language of the surronding
- // text.
- // Why this cleverness? (Andre')
- if (!was_empty && paragraphs().begin()->empty() &&
- paragraphs().size() == 1) {
- LyXFont font(LyXFont::ALL_IGNORE);
- font.setLanguage(cur.bv().getParentLanguage(this));
- text_.setFont(cur, font, false);
- }
-
- //lyxerr << "InsetText::priv_dispatch (end)" << endl;
}
int InsetText::docbook(Buffer const & buf, ostream & os,
OutputParams const & runparams) const
{
- docbookParagraphs(buf, paragraphs(), os, runparams);
+ docbookParagraphs(paragraphs(), buf, os, runparams);
return 0;
}
}
-void InsetText::getCursorPos(CursorSlice const & cur, int & x, int & y) const
-{
- x = text_.cursorX(cur);
- y = text_.cursorY(cur);
-}
-
-
-bool InsetText::insetAllowed(InsetOld::Code code) const
+void InsetText::getCursorPos(LCursor const & cur, int & x, int & y) const
{
- // in_insetAllowed is a really gross hack,
- // to allow us to call the owner's insetAllowed
- // without stack overflow, which can happen
- // when the owner uses InsetCollapsable::insetAllowed()
- if (in_insetAllowed)
- return true;
- in_insetAllowed = true;
- bool const ret = owner() && owner()->insetAllowed(code);
- in_insetAllowed = false;
- return ret;
+ x = text_.cursorX(cur.top());
+ y = text_.cursorY(cur.top());
}
}
-void InsetText::setDrawFrame(DrawFrame how)
+void InsetText::setDrawFrame(bool flag)
{
- drawFrame_ = how;
+ drawFrame_ = flag;
}
}
-int InsetText::scroll(bool /*recursive*/) const
-{
- return UpdatableInset::scroll(false);
-}
-
-
-void InsetText::clearInset(Painter & pain, int x, int y) const
-{
- int w = dim_.wid;
- int h = dim_.asc + dim_.des;
- int ty = y - dim_.asc;
-
- if (ty < 0) {
- h += ty;
- ty = 0;
- }
- if (ty + h > pain.paperHeight())
- h = pain.paperHeight();
- if (xo_ + w > pain.paperWidth())
- w = pain.paperWidth();
- pain.fillRectangle(x + 1, ty + 1, w - 3, h - 1, backgroundColor());
-}
-
-
LyXText * InsetText::getText(int i) const
{
return (i == 0) ? const_cast<LyXText*>(&text_) : 0;
void InsetText::appendParagraphs(Buffer * buffer, ParagraphList & plist)
{
+#ifdef WITH_WARNINGS
#warning FIXME Check if Changes stuff needs changing here. (Lgb)
// And it probably does. You have to take a look at this John. (Lgb)
#warning John, have a look here. (Lgb)
+#endif
ParagraphList::iterator pit = plist.begin();
ParagraphList::iterator ins = paragraphs().insert(paragraphs().end(), *pit);
++pit;
- mergeParagraph(buffer->params(), paragraphs(), boost::prior(ins));
+ mergeParagraph(buffer->params(), paragraphs(),
+ ins - paragraphs().begin() - 1);
ParagraphList::iterator pend = plist.end();
for (; pit != pend; ++pit)
}
-ParagraphList & InsetText::paragraphs() const
+ParagraphList const & InsetText::paragraphs() const
+{
+ return text_.paragraphs();
+}
+
+
+ParagraphList & InsetText::paragraphs()
{
- return const_cast<ParagraphList &>(text_.paragraphs());
+ return text_.paragraphs();
}
projects / lyx.git / blobdiff