* InsetCollapsable:

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

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 2e9a3dd4b3449681506bc3dee297b61a34a526c8..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"
@@ -42,8 +42,8 @@
 #include "ParIterator.h"
 #include "Row.h"
 #include "sgml.h"
+#include "TextMetrics.h"
 #include "TexRow.h"
-#include "Undo.h"
 
 #include "frontends/alert.h"
 #include "frontends/Painter.h"
@@ -75,7 +75,7 @@ using std::vector;
 
 
 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());
@@ -166,23 +166,23 @@ 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;
 
        // Hand font through to contained lyxtext:
-       tm.font_ = mi.base.font;
+       tm.font_.fontInfo() = mi.base.font;
        mi.base.textwidth -= 2 * TEXT_TO_INSET_OFFSET;
-       tm.metrics(mi, dim);
+       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;
-       bool const changed = dim_ != dim;
-       dim_ = dim;
-       return changed;
 }
 
 
@@ -191,8 +191,7 @@ void InsetText::draw(PainterInfo & pi, int x, int y) const
        TextMetrics & tm = pi.base.bv->textMetrics(&text_);
 
        if (drawFrame_ || pi.full_repaint) {
-               int const w = hasFixedWidth() ? 
-                       tm.maxWidth() : tm.width() + 2 * TEXT_TO_INSET_OFFSET;
+               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)
@@ -217,7 +216,7 @@ 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();
 }
 
 
@@ -366,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;
 }
@@ -404,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);
        }