Fix text frame drawing.

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

diff --git a/src/insets/Inset.cpp b/src/insets/Inset.cpp
index c57add10452d6ca1f01623ce7ae318c755bb3a09..033764b307f055b44b962cf6f0da6fefe664492a 100644 (file)
--- a/src/insets/Inset.cpp
+++ b/src/insets/Inset.cpp
@@ -17,6 +17,7 @@
 #include "Inset.h"
 
 #include "Buffer.h"
+#include "BufferParams.h"
 #include "BufferView.h"
 #include "Color.h"
 #include "CoordCache.h"
@@ -28,7 +29,8 @@
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "gettext.h"
-#include "LyXText.h"
+#include "Text.h"
+#include "TextClass.h"
 #include "MetricsInfo.h"
 #include "MetricsInfo.h"
 
@@ -99,6 +101,7 @@ static TranslatorMap const build_translator()
                InsetName("charstyle", Inset::CHARSTYLE_CODE),
                InsetName("vspace", Inset::VSPACE_CODE),
                InsetName("mathmacroarg", Inset::MATHMACROARG_CODE),
+               InsetName("listings", Inset::LISTINGS_CODE),
        };
 
        std::size_t const insetnames_size =
@@ -116,29 +119,10 @@ static TranslatorMap const build_translator()
 
 /// pretty arbitrary dimensions
 Inset::Inset()
-       : dim_(10, 10, 10), background_color_(Color::background)
+       : dim_(10, 10, 10)
 {}
 
 
-Inset::Inset(Inset const & inset)
-       : dim_(inset.dim_), background_color_(inset.background_color_)
-{}
-
-
-std::auto_ptr<Inset> Inset::clone() const
-{
-       std::auto_ptr<Inset> b = doClone();
-       BOOST_ASSERT(typeid(*b) == typeid(*this));
-       return b;
-}
-
-
-docstring Inset::insetName() const 
-{
-       return from_ascii("unknown");
-}
-
-
 Inset::Code Inset::translate(std::string const & name)
 {
        static TranslatorMap const translator = build_translator();
@@ -278,7 +262,7 @@ void Inset::cursorPos(BufferView const & /*bv*/, CursorSlice const &,
 void Inset::metricsMarkers(Dimension & dim, int framesize) const
 {
        dim.wid += 2 * framesize;
-       dim.asc += framesize;
+       dim.des += framesize;
 }
 
 
@@ -292,8 +276,8 @@ void Inset::metricsMarkers2(Dimension & dim, int framesize) const
 
 void Inset::drawMarkers(PainterInfo & pi, int x, int y) const
 {
-       Color::color pen_color = editing(pi.base.bv)?
-               Color::mathframe : Color::background;
+       Color::color pen_color = mouseHovered() || editing(pi.base.bv)?
+               Color::mathframe : Color::mathcorners;
 
        int const t = x + width() - 1;
        int const d = y + descent();
@@ -307,8 +291,8 @@ void Inset::drawMarkers(PainterInfo & pi, int x, int y) const
 
 void Inset::drawMarkers2(PainterInfo & pi, int x, int y) const
 {
-       Color::color pen_color = editing(pi.base.bv)?
-               Color::mathframe : Color::background;
+       Color::color pen_color = mouseHovered() || editing(pi.base.bv)?
+               Color::mathframe : Color::mathcorners;
 
        drawMarkers(pi, x, y);
        int const t = x + width() - 1;
@@ -354,22 +338,22 @@ bool Inset::covers(BufferView const & bv, int x, int y) const
 }
 
 
-void Inset::dump() const
+InsetLayout const & Inset::getLayout(BufferParams const & bp) const
 {
-       Buffer buf("foo", 1);
-       write(buf, lyxerr);
+       return bp.getTextClass().insetlayout(name());  
 }
 
 
-void Inset::setBackgroundColor(Color_color color)
+void Inset::dump() const
 {
-       background_color_ = color;
+       Buffer buf("foo", 1);
+       write(buf, lyxerr);
 }
 
 
 Color_color Inset::backgroundColor() const
 {
-       return Color::color(background_color_);
+       return Color::background;
 }