use setPosCache where appropriate

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8916 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/mathed/math_data.C b/src/mathed/math_data.C
index e3422913756d3b61caa273e77de98eeaa09239c1..8a97e3e53a677856ef380cbcbdd7339858a652e8 100644 (file)
--- a/src/mathed/math_data.C
+++ b/src/mathed/math_data.C
@@ -276,9 +276,8 @@ void MathArray::metrics(MetricsInfo & mi) const
 void MathArray::draw(PainterInfo & pi, int x, int y) const
 {
        //lyxerr << "MathArray::draw: x: " << x << " y: " << y << endl;
-
-       xo_    = x;
-       yo_    = y;
+       xo_ = x;
+       yo_ = y;
 
        if (empty()) {
                pi.pain.rectangle(x, y - ascent(), width(), height(), LColor::mathline);
@@ -332,16 +331,13 @@ void MathArray::metricsT(TextMetricsInfo const & mi, Dimension & dim) const
 
 void MathArray::drawT(TextPainter & pain, int x, int y) const
 {
-       //if (drawn_ && x == xo_ && y == yo_)
-       //      return;
        //lyxerr << "x: " << x << " y: " << y << ' ' << pain.workAreaHeight() << endl;
-       xo_    = x;
-       yo_    = y;
-       drawn_ = true;
+       xo_ = x;
+       yo_ = y;
 
        for (const_iterator it = begin(), et = end(); it != et; ++it) {
                (*it)->drawT(pain, x, y);
-               //x += (*it->width_;
+               //x += (*it)->width_;
                x += 2;
        }
 }

diff --git a/src/mathed/math_nestinset.C b/src/mathed/math_nestinset.C
index 591678b7626305f9f80879444db2b9fdb2e3dd70..3306b0638487ceadef47682a0dcc03c330ab4a0b 100644 (file)
--- a/src/mathed/math_nestinset.C
+++ b/src/mathed/math_nestinset.C
@@ -907,7 +907,6 @@ void MathNestInset::lfunMousePress(LCursor & cur, FuncRequest & cmd)
        if (cmd.button() == mouse_button::button1) {
                first_x = cmd.x;
                first_y = cmd.y;
-               //cur.setScreenPos(cmd.x + xo_, cmd.y + yo_);
                lyxerr << "lfunMousePress: setting cursor to: " << cur << endl;
                cur.resetAnchor();
                cur.bv().cursor() = cur;

diff --git a/src/mathed/math_unknowninset.C b/src/mathed/math_unknowninset.C
index c304b4b9e2a9f7e2bd8264b12fc23784a1c5beaf..496b274c0549c8c3212992261cd9277629cbed1d 100644 (file)
--- a/src/mathed/math_unknowninset.C
+++ b/src/mathed/math_unknowninset.C
@@ -62,8 +62,7 @@ void MathUnknownInset::draw(PainterInfo & pi, int x, int y) const
                drawStrBlack(pi, x, y, name_);
        else
                drawStrRed(pi, x, y, name_);
-       xo_ = x;
-       yo_ = y;
+       setPosCache(pi, x, y);
 }