* InsetCollapsable:

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

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index caff61676cd4e674bc40faeec0f80b634a10f164..cc33329a974fc8867ba3a6e9c267cc556a0d81f7 100644 (file)
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -25,8 +25,8 @@
 #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"
@@ -40,11 +40,10 @@
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
 #include "ParIterator.h"
-#include "rowpainter.h"
 #include "Row.h"
 #include "sgml.h"
+#include "TextMetrics.h"
 #include "TexRow.h"
-#include "Undo.h"
 
 #include "frontends/alert.h"
 #include "frontends/Painter.h"
@@ -71,22 +70,15 @@ using std::endl;
 using std::for_each;
 using std::max;
 using std::string;
-using std::auto_ptr;
 using std::ostream;
 using std::vector;
 
 
-int InsetText::border_ = 2;
-
-
 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());
-       // Dispose of the infamous L-shaped cursor.
-       text_.current_font.setLanguage(bp.language);
-       text_.real_current_font.setLanguage(bp.language);
        init();
 }
 
@@ -98,10 +90,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();
 }
 
@@ -131,9 +119,20 @@ void InsetText::clear()
 }
 
 
-auto_ptr<Inset> InsetText::doClone() const
+Inset * InsetText::clone() const
+{
+       return new InsetText(*this);
+}
+
+
+Dimension const InsetText::dimension(BufferView const & bv) const
 {
-       return auto_ptr<Inset>(new InsetText(*this));
+       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;
 }
 
 
@@ -167,57 +166,40 @@ 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_);
 
        //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.metrics(mi, dim);
-       dim.asc += border_;
-       dim.des += border_;
-       dim.wid += 2 * border_;
-       mi.base.textwidth += 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_);
 
-       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,
-                                 (hasFixedWidth() ? tm.maxWidth() : w),
-                                 h, frameColor());
+       if (drawFrame_ || pi.full_repaint) {
+               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, yframe, w, h, backgroundColor());
+               if (drawFrame_)
+                       pi.pain.rectangle(x, yframe, 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,
-                             (hasFixedWidth() ? tm.maxWidth() : w),
-                             h, backgroundColor());
-       text_.drawSelection(pi, x + border_, y);
+       tm.draw(pi, x + TEXT_TO_INSET_OFFSET, y);
 }
 
 
@@ -234,13 +216,13 @@ void InsetText::edit(Cursor & cur, bool left)
        int const pos = left ? 0 : paragraphs().back().size();
        text_.setCursor(cur.top(), pit, pos);
        cur.clearSelection();
-       finishUndo();
+       cur.finishUndo();
 }
 
 
 Inset * InsetText::editXY(Cursor & cur, int x, int y)
 {
-       return text_.editXY(cur, x, y);
+       return cur.bv().textMetrics(&text_).editXY(cur, x, y);
 }
 
 
@@ -336,8 +318,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) + TEXT_TO_INSET_OFFSET;
+       y = bv.textMetrics(&text_).cursorY(sl, boundary);
 }
 
 
@@ -383,13 +365,13 @@ void InsetText::setDrawFrame(bool flag)
 }
 
 
-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;
 }
@@ -421,8 +403,8 @@ void InsetText::addPreview(PreviewLoader & loader) const
        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);
        }