Fix text frame drawing.

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

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index dafdef6db2902f9f0332258f5bde436705a745a1..d6a01cc60780397b046ba2ec8474cddbe8cee9bd 100644 (file)
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -70,7 +70,6 @@ using std::endl;
 using std::for_each;
 using std::max;
 using std::string;
-using std::auto_ptr;
 using std::ostream;
 using std::vector;
 
@@ -83,9 +82,6 @@ InsetText::InsetText(BufferParams const & bp)
 {
        paragraphs().push_back(Paragraph());
        paragraphs().back().layout(bp.getTextClass().defaultLayout());
-       // Dispose of the infamous L-shaped cursor.
-       text_.current_font.setLanguage(bp.language);
-       text_.real_current_font.setLanguage(bp.language);
        init();
 }
 
@@ -97,10 +93,6 @@ InsetText::InsetText(InsetText const & in)
        drawFrame_ = in.drawFrame_;
        frame_color_ = in.frame_color_;
        text_.paragraphs() = in.text_.paragraphs();
-       // Hand current buffer language down to "cloned" textinsets
-       // e.g. tabular cells
-       text_.current_font = in.text_.current_font;
-       text_.real_current_font = in.text_.real_current_font;
        init();
 }
 
@@ -130,9 +122,9 @@ void InsetText::clear()
 }
 
 
-auto_ptr<Inset> InsetText::doClone() const
+Inset * InsetText::clone() const
 {
-       return auto_ptr<Inset>(new InsetText(*this));
+       return new InsetText(*this);
 }
 
 
@@ -171,15 +163,15 @@ bool InsetText::metrics(MetricsInfo & mi, Dimension & dim) const
        TextMetrics & tm = mi.base.bv->textMetrics(&text_);
 
        //lyxerr << "InsetText::metrics: width: " << mi.base.textwidth << endl;
-       mi.base.textwidth -= 2 * border_;
-       font_ = mi.base.font;
+
        // Hand font through to contained lyxtext:
-       text_.font_ = mi.base.font;
+       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_;
-       mi.base.textwidth += 2 * border_;
        bool const changed = dim_ != dim;
        dim_ = dim;
        return changed;
@@ -193,32 +185,17 @@ void InsetText::draw(PainterInfo & pi, int x, int y) const
 
        TextMetrics & tm = pi.base.bv->textMetrics(&text_);
 
-       tm.draw(pi, x + border_, y);
-
-       if (drawFrame_) {
-               int const w = tm.width() + 2 * border_;
-               int const a = tm.ascent() + border_;
-               int const h = a + tm.descent() + border_;
-               pi.pain.rectangle(x, y - a,
-                                 (hasFixedWidth() ? tm.maxWidth() : w),
-                                 h, frameColor());
+       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_;
+               if (pi.full_repaint)
+                       pi.pain.fillRectangle(x, y - a, w, h, backgroundColor());
+               if (drawFrame_)
+                       pi.pain.rectangle(x, y - a, w, h, frameColor());
        }
-}
-
-
-void InsetText::drawSelection(PainterInfo & pi, int x, int y) const
-{
-       if (!pi.base.bv->cursor().selection())
-               return;
-
-       TextMetrics & tm = pi.base.bv->textMetrics(&text_);
-       int const w = tm.width() + 2 * border_;
-       int const a = tm.ascent() + border_;
-       int const h = a + tm.descent() + border_;
-       pi.pain.fillRectangle(x, y - a,
-                             (hasFixedWidth() ? tm.maxWidth() : w),
-                             h, backgroundColor());
-       text_.drawSelection(pi, x + border_, y);
+       tm.draw(pi, x + border_, y);
 }
 
 
@@ -241,7 +218,7 @@ void InsetText::edit(Cursor & cur, bool left)
 
 Inset * InsetText::editXY(Cursor & cur, int x, int y)
 {
-       return text_.editXY(cur, x, y);
+       return cur.bv().textMetrics(&text_).editXY(cur, x, y);
 }
 
 
@@ -337,8 +314,8 @@ void InsetText::validate(LaTeXFeatures & features) const
 void InsetText::cursorPos(BufferView const & bv,
                CursorSlice const & sl, bool boundary, int & x, int & y) const
 {
-       x = text_.cursorX(bv, sl, boundary) + border_;
-       y = text_.cursorY(bv, sl, boundary);
+       x = bv.textMetrics(&text_).cursorX(sl, boundary) + border_;
+       y = bv.textMetrics(&text_).cursorY(sl, boundary);
 }