#include "CoordCache.h"
#include "CutAndPaste.h"
#include "Cursor.h"
-#include "debug.h"
+#include "support/debug.h"
#include "DispatchResult.h"
#include "ErrorList.h"
#include "FuncRequest.h"
-#include "gettext.h"
+#include "support/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 "TextClass.h"
+#include "TextMetrics.h"
#include "TexRow.h"
-#include "Undo.h"
#include "frontends/alert.h"
#include "frontends/Painter.h"
-#include "support/lyxalgo.h" // count
+#include "support/lstrings.h"
#include <boost/bind.hpp>
-#include <boost/current_function.hpp>
-#include <boost/signal.hpp>
+#include <boost/assert.hpp>
-#include <sstream>
-
-
-namespace lyx {
-
-using graphics::PreviewLoader;
-
-using support::isStrUnsignedInt;
+using namespace std;
+using namespace lyx::support;
using boost::bind;
using boost::ref;
-using std::endl;
-using std::for_each;
-using std::max;
-using std::string;
-using std::ostream;
-using std::vector;
-
+namespace lyx {
-int InsetText::border_ = 2;
+using graphics::PreviewLoader;
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());
}
+Dimension const InsetText::dimension(BufferView const & bv) const
+{
+ TextMetrics const & tm = bv.textMetrics(&text_);
+ Dimension dim = tm.dimension();
+ dim.wid += 2 * TEXT_TO_INSET_OFFSET;
+ dim.des += TEXT_TO_INSET_OFFSET;
+ dim.asc += TEXT_TO_INSET_OFFSET;
+ return dim;
+}
+
+
void InsetText::write(Buffer const & buf, ostream & os) const
{
os << "Text\n";
}
-bool InsetText::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetText::metrics(MetricsInfo & mi, Dimension & dim) const
{
TextMetrics & tm = mi.base.bv->textMetrics(&text_);
//lyxerr << "InsetText::metrics: width: " << mi.base.textwidth << endl;
// Hand font through to contained lyxtext:
- tm.font_ = mi.base.font;
- mi.base.textwidth -= 2 * border_;
- tm.metrics(mi, dim);
- mi.base.textwidth += 2 * border_;
- dim.asc += border_;
- dim.des += border_;
- dim.wid += 2 * border_;
- bool const changed = dim_ != dim;
- dim_ = dim;
- return changed;
+ tm.font_.fontInfo() = mi.base.font;
+ mi.base.textwidth -= 2 * TEXT_TO_INSET_OFFSET;
+ 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;
}
void InsetText::draw(PainterInfo & pi, int x, int y) const
{
- // update our idea of where we are
- setPosCache(pi, x, y);
-
TextMetrics & tm = pi.base.bv->textMetrics(&text_);
if (drawFrame_ || pi.full_repaint) {
- int const w = hasFixedWidth() ?
- tm.maxWidth() : tm.width() + 2 * border_;
- int const a = border_;
- int const h = a + tm.height() + border_;
+ 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)
- pi.pain.fillRectangle(x, y - a, w, h, backgroundColor());
+ pi.pain.fillRectangle(x, yframe, w, h, backgroundColor());
if (drawFrame_)
- pi.pain.rectangle(x, y - a, w, h, frameColor());
+ pi.pain.rectangle(x, yframe, w, h, frameColor());
}
- tm.draw(pi, x + border_, y);
+ tm.draw(pi, x + TEXT_TO_INSET_OFFSET, y);
}
int const pos = left ? 0 : paragraphs().back().size();
text_.setCursor(cur.top(), pit, pos);
cur.clearSelection();
- finishUndo();
+ cur.finishUndo();
}
void InsetText::doDispatch(Cursor & cur, FuncRequest & cmd)
{
- LYXERR(Debug::ACTION) << BOOST_CURRENT_FUNCTION
- << " [ cmd.action = "
- << cmd.action << ']' << endl;
+ LYXERR(Debug::ACTION, "InsetText::doDispatch()"
+ << " [ cmd.action = " << cmd.action << ']');
text_.dispatch(cur, cmd);
}
void InsetText::cursorPos(BufferView const & bv,
CursorSlice const & sl, bool boundary, int & x, int & y) const
{
- x = bv.textMetrics(&text_).cursorX(sl, boundary) + border_;
+ x = bv.textMetrics(&text_).cursorX(sl, boundary) + TEXT_TO_INSET_OFFSET;
y = bv.textMetrics(&text_).cursorY(sl, boundary);
}
}
-Color_color InsetText::frameColor() const
+ColorCode InsetText::frameColor() const
{
- return Color::color(frame_color_);
+ return frame_color_;
}
-void InsetText::setFrameColor(Color_color col)
+void InsetText::setFrameColor(ColorCode col)
{
frame_color_ = col;
}
ParagraphList::iterator ins = pl.insert(pl.end(), *pit);
++pit;
mergeParagraph(buffer->params(), pl,
- std::distance(pl.begin(), ins) - 1);
+ distance(pl.begin(), ins) - 1);
for_each(pit, plist.end(),
bind(&ParagraphList::push_back, ref(pl), _1));
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);
}