* src/paragraph_funcs.cpp (breakParagraph): change parameter 'flag' to

[lyx.git] / src / insets / InsetText.cpp

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 93de904c43d5c1ca8ec61803668079d56c4eca5b..1f19ea5ad38fb9c2d8a82d2d30beb2f36e500cf2 100644 (file)
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -74,9 +74,6 @@ using std::ostream;
 using std::vector;
 
 
-int InsetText::border_ = 2;
-
-
 InsetText::InsetText(BufferParams const & bp)
        : drawFrame_(false), frame_color_(Color::insetframe)
 {
@@ -128,6 +125,17 @@ Inset * InsetText::clone() const
 }
 
 
+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";
@@ -158,7 +166,7 @@ void InsetText::read(Buffer const & buf, Lexer & lex)
 }
 
 
-bool InsetText::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetText::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        TextMetrics & tm = mi.base.bv->textMetrics(&text_);
 
@@ -166,37 +174,32 @@ bool InsetText::metrics(MetricsInfo & mi, Dimension & dim) const
 
        // 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;
+       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 = tm.ascent() + border_;
-               int const h = a + tm.descent() + 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.drawSelection(pi, x + border_, y);
-       tm.draw(pi, x + border_, y);
+       tm.draw(pi, x + TEXT_TO_INSET_OFFSET, y);
 }
 
 
@@ -315,7 +318,7 @@ void InsetText::validate(LaTeXFeatures & features) const
 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);
 }