#include "ErrorList.h"
#include "FuncRequest.h"
#include "gettext.h"
+#include "InsetList.h"
#include "Intl.h"
-#include "Color.h"
#include "lyxfind.h"
#include "Lexer.h"
#include "LyXRC.h"
#include "ParIterator.h"
#include "Row.h"
#include "sgml.h"
+#include "TextMetrics.h"
#include "TexRow.h"
-#include "Undo.h"
#include "frontends/alert.h"
#include "frontends/Painter.h"
InsetText::InsetText(BufferParams const & bp)
- : drawFrame_(false), frame_color_(Color::insetframe)
+ : drawFrame_(false), frame_color_(Color_insetframe)
{
paragraphs().push_back(Paragraph());
paragraphs().back().layout(bp.getTextClass().defaultLayout());
}
-bool InsetText::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetText::metrics(MetricsInfo & mi, Dimension & dim) const
{
TextMetrics & tm = mi.base.bv->textMetrics(&text_);
// Hand font through to contained lyxtext:
tm.font_ = mi.base.font;
mi.base.textwidth -= 2 * TEXT_TO_INSET_OFFSET;
- tm.metrics(mi, dim);
+ if (hasFixedWidth())
+ tm.metrics(mi, dim, mi.base.textwidth);
+ else
+ tm.metrics(mi, dim);
mi.base.textwidth += 2 * TEXT_TO_INSET_OFFSET;
dim.asc += TEXT_TO_INSET_OFFSET;
dim.des += TEXT_TO_INSET_OFFSET;
dim.wid += 2 * TEXT_TO_INSET_OFFSET;
- bool const changed = dim_ != dim;
- dim_ = dim;
- return changed;
}
TextMetrics & tm = pi.base.bv->textMetrics(&text_);
if (drawFrame_ || pi.full_repaint) {
- int const w = hasFixedWidth() ?
- tm.maxWidth() : tm.width() + 2 * TEXT_TO_INSET_OFFSET;
+ int const w = tm.width() + 2 * TEXT_TO_INSET_OFFSET;
int const yframe = y - TEXT_TO_INSET_OFFSET - tm.ascent();
int const h = tm.height() + 2 * TEXT_TO_INSET_OFFSET;
if (pi.full_repaint)
int const pos = left ? 0 : paragraphs().back().size();
text_.setCursor(cur.top(), pit, pos);
cur.clearSelection();
- finishUndo();
+ cur.finishUndo();
}
}
-Color_color InsetText::frameColor() const
+ColorCode InsetText::frameColor() const
{
- return Color::color(frame_color_);
+ return ColorCode(frame_color_);
}
-void InsetText::setFrameColor(Color_color col)
+void InsetText::setFrameColor(ColorCode col)
{
frame_color_ = col;
}
ParagraphList::const_iterator pend = paragraphs().end();
for (; pit != pend; ++pit) {
- InsetList::const_iterator it = pit->insetlist.begin();
- InsetList::const_iterator end = pit->insetlist.end();
+ InsetList::const_iterator it = pit->insetList().begin();
+ InsetList::const_iterator end = pit->insetList().end();
for (; it != end; ++it)
it->inset->addPreview(loader);
}