X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finset.C;h=5f0b633794979a5e7b0c6f9fb2c615067bc68579;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=d3284e17a7bdbe37913fb72b04a42916dd240af5;hpb=29ef6251e8eef7827bc10ee27c8ed320c65bdfcd;p=lyx.git diff --git a/src/insets/inset.C b/src/insets/inset.C index d3284e17a7..5f0b633794 100644 --- a/src/insets/inset.C +++ b/src/insets/inset.C @@ -14,29 +14,29 @@ #include #include "inset.h" -#include "updatableinset.h" #include "BufferView.h" #include "debug.h" #include "gettext.h" #include "lyxtext.h" #include "LColor.h" +#include "metricsinfo.h" +#include "coordcache.h" +namespace lyx { + using std::string; InsetOld::InsetOld() - : InsetBase(), - xo_(0), yo_(0), scx(0), owner_(0), - //background_color_(LColor::inherit) + : //background_color_(LColor::inherit) background_color_(LColor::background) {} InsetOld::InsetOld(InsetOld const & in) - : InsetBase(), - xo_(0), yo_(0), scx(0), owner_(0), name_(in.name_), + : InsetBase(in), name_(in.name_), background_color_(in.background_color_) {} @@ -53,14 +53,6 @@ LColor_color InsetOld::backgroundColor() const } -bool InsetOld::forceDefaultParagraphs(InsetBase const * inset) const -{ - if (owner()) - return owner()->forceDefaultParagraphs(inset); - return false; -} - - int InsetOld::ascent() const { return dim_.asc; @@ -79,17 +71,11 @@ int InsetOld::width() const } -int InsetOld::scroll(bool recursive) const +void InsetOld::setPosCache(PainterInfo const & pi, int x, int y) const { - if (!recursive || !owner_) - return scx; - return 0; + //lyxerr << "InsetOld:: position cache to " << x << " " << y << std::endl; + pi.base.bv->coordCache().insets().add(this, x, y); } -void InsetOld::setPosCache(PainterInfo const &, int x, int y) const -{ - //lyxerr << "InsetOld:: position cache to " << x << " " << y << std::endl; - xo_ = x; - yo_ = y; -} +} // namespace lyx