* the old cursor is stored before dispatch and then used after moving

[lyx.git] / src / mathed / InsetMathHull.cpp

diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp
index ba381f4d727d9694765862aaa76562204369cef1..38f0226bc77fd97799cf8bef6f9f7be1239f6e1d 100644 (file)
--- a/src/mathed/InsetMathHull.cpp
+++ b/src/mathed/InsetMathHull.cpp
@@ -337,11 +337,10 @@ void InsetMathHull::draw(PainterInfo & pi, int x, int y) const
 {
        use_preview_ = previewState(pi.base.bv);
 
-       Cursor & cur = pi.base.bv->cursor();
        // background of mathed under focus is not painted because
        // selection at the top level of nested inset is difficult to handle.
        if (!editing(pi.base.bv))
-               pi.pain.fillRectangle(x + 1, y - ascent() + 1, width() - 2, 
+               pi.pain.fillRectangle(x + 1, y - ascent() + 1, width() - 2,
                                ascent() + descent() - 1, Color::mathbg);
 
        if (use_preview_) {
@@ -472,9 +471,9 @@ bool InsetMathHull::ams() const
 }
 
 
-bool InsetMathHull::display() const
+Inset::DisplayType InsetMathHull::display() const
 {
-       return type_ != hullSimple && type_ != hullNone;
+       return (type_ != hullSimple && type_ != hullNone) ? AlignCenter : Inline;
 }
 
 
@@ -1050,8 +1049,6 @@ void InsetMathHull::doDispatch(Cursor & cur, FuncRequest & cmd)
 
        case LFUN_FINISHED_LEFT:
        case LFUN_FINISHED_RIGHT:
-       case LFUN_FINISHED_UP:
-       case LFUN_FINISHED_DOWN:
                //lyxerr << "action: " << cmd.action << endl;
                InsetMathGrid::doDispatch(cur, cmd);
                notifyCursorLeaves(cur);
@@ -1189,8 +1186,8 @@ bool InsetMathHull::getStatus(Cursor & cur, FuncRequest const & cmd,
        switch (cmd.action) {
        case LFUN_FINISHED_LEFT:
        case LFUN_FINISHED_RIGHT:
-       case LFUN_FINISHED_UP:
-       case LFUN_FINISHED_DOWN:
+       case LFUN_UP:
+       case LFUN_DOWN:
                status.enabled(true);
                return true;
        case LFUN_BREAK_LINE:
@@ -1329,7 +1326,7 @@ void InsetMathHull::edit(Cursor & cur, bool left)
        left ? idxFirst(cur) : idxLast(cur);
        // The inset formula dimension is not necessarily the same as the
        // one of the instant preview image, so we have to indicate to the
-       // BufferView that a metrics update is needed. 
+       // BufferView that a metrics update is needed.
        cur.updateFlags(Update::Force);
 }
 
@@ -1447,7 +1444,7 @@ void InsetMathHull::read(Buffer const &, Lexer & lex)
 
 
 int InsetMathHull::plaintext(Buffer const &, odocstream & os,
-                             OutputParams const &) const
+                            OutputParams const &) const
 {
        if (0 && display()) {
                Dimension dim;
@@ -1472,7 +1469,7 @@ int InsetMathHull::plaintext(Buffer const &, odocstream & os,
 
 
 int InsetMathHull::docbook(Buffer const & buf, odocstream & os,
-                           OutputParams const & runparams) const
+                          OutputParams const & runparams) const
 {
        MathStream ms(os);
        int res = 0;