Fix text frame drawing.

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

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 2e5c8f6ff05051483994638fe87ff2daddcf32e1..d6a01cc60780397b046ba2ec8474cddbe8cee9bd 100644 (file)
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -14,6 +14,7 @@
 #include "InsetNewline.h"
 
 #include "Buffer.h"
+#include "buffer_funcs.h"
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "CoordCache.h"
@@ -29,7 +30,7 @@
 #include "lyxfind.h"
 #include "Lexer.h"
 #include "LyXRC.h"
-#include "LyXText.h"
+#include "Text.h"
 #include "MetricsInfo.h"
 #include "OutputParams.h"
 #include "output_docbook.h"
@@ -38,7 +39,7 @@
 #include "Paragraph.h"
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
-#include "rowpainter.h"
+#include "ParIterator.h"
 #include "Row.h"
 #include "sgml.h"
 #include "TexRow.h"
@@ -51,6 +52,7 @@
 
 #include <boost/bind.hpp>
 #include <boost/current_function.hpp>
+#include <boost/signal.hpp>
 
 #include <sstream>
 
@@ -68,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;
 
@@ -80,10 +81,7 @@ InsetText::InsetText(BufferParams const & bp)
        : drawFrame_(false), frame_color_(Color::insetframe)
 {
        paragraphs().push_back(Paragraph());
-       paragraphs().back().layout(bp.getLyXTextClass().defaultLayout());
-       // Dispose of the infamous L-shaped cursor.
-       text_.current_font.setLanguage(bp.language);
-       text_.real_current_font.setLanguage(bp.language);
+       paragraphs().back().layout(bp.getTextClass().defaultLayout());
        init();
 }
 
@@ -95,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();
 }
 
@@ -119,7 +113,7 @@ void InsetText::clear()
        ParagraphList & pars = paragraphs();
 
        // This is a gross hack...
-       Layout_ptr old_layout = pars.begin()->layout();
+       LayoutPtr old_layout = pars.begin()->layout();
 
        pars.clear();
        pars.push_back(Paragraph());
@@ -128,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);
 }
 
 
@@ -169,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;
@@ -191,43 +185,17 @@ void InsetText::draw(PainterInfo & pi, int x, int y) const
 
        TextMetrics & tm = pi.base.bv->textMetrics(&text_);
 
-       text_.background_color_ = backgroundColor();
-       text_.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,
-                                 ((wide() || 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
-{
-       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,
-                             ((wide() || hasFixedWidth()) ? tm.maxWidth() : w),
-                             h, backgroundColor());
-       text_.drawSelection(pi, x + border_, y);
-}
-
-
-bool InsetText::covers(BufferView const & bv, int x, int y) const
-{
-       TextMetrics const & tm = bv.textMetrics(&text_);
-
-       return bv.coordCache().getInsets().has(this)
-                       && x >= xo(bv)
-                       && x <= xo(bv) + width() + (wide() ? tm.maxWidth() : 0)
-                       && y >= yo(bv) - ascent()
-                       && y <= yo(bv) + descent();
+       tm.draw(pi, x + border_, y);
 }
 
 
@@ -250,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);
 }
 
 
@@ -293,7 +261,7 @@ void InsetText::rejectChanges(BufferParams const & bparams)
 
 
 int InsetText::latex(Buffer const & buf, odocstream & os,
-                     OutputParams const & runparams) const
+                    OutputParams const & runparams) const
 {
        TexRow texrow;
        latexParagraphs(buf, paragraphs(), os, texrow, runparams);
@@ -302,7 +270,7 @@ int InsetText::latex(Buffer const & buf, odocstream & os,
 
 
 int InsetText::plaintext(Buffer const & buf, odocstream & os,
-                         OutputParams const & runparams) const
+                        OutputParams const & runparams) const
 {
        ParagraphList::const_iterator beg = paragraphs().begin();
        ParagraphList::const_iterator end = paragraphs().end();
@@ -329,7 +297,7 @@ int InsetText::plaintext(Buffer const & buf, odocstream & os,
 
 
 int InsetText::docbook(Buffer const & buf, odocstream & os,
-                       OutputParams const & runparams) const
+                      OutputParams const & runparams) const
 {
        docbookParagraphs(paragraphs(), buf, os, runparams);
        return 0;
@@ -346,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);
 }
 
 
@@ -421,7 +389,7 @@ void InsetText::appendParagraphs(Buffer * buffer, ParagraphList & plist)
                       std::distance(pl.begin(), ins) - 1);
 
        for_each(pit, plist.end(),
-                bind(&ParagraphList::push_back, ref(pl), _1));
+                bind(&ParagraphList::push_back, ref(pl), _1));
 }
 
 
@@ -460,4 +428,13 @@ ParagraphList & InsetText::paragraphs()
 }
 
 
+void InsetText::updateLabels(Buffer const & buf, ParIterator const & it)
+{
+       ParIterator it2 = it;
+       it2.forwardPos();
+       BOOST_ASSERT(&it2.inset() == this && it2.pit() == 0);
+       lyx::updateLabels(buf, it2);
+}
+
+
 } // namespace lyx