Fixup 097da3a9: fix horizontal navigatiion in InsetMathRoot

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

diff --git a/src/mathed/MathRow.cpp b/src/mathed/MathRow.cpp
index 783e85ab54ab2b6452adcd0bf907f45a4370e1de..472b6db927ad476bdf49605da12f7ba9d2abd2c4 100644 (file)
--- a/src/mathed/MathRow.cpp
+++ b/src/mathed/MathRow.cpp
@@ -18,6 +18,7 @@
 #include "MathSupport.h"
 
 #include "BufferView.h"
+#include "ColorSet.h"
 #include "CoordCache.h"
 #include "MetricsInfo.h"
 
@@ -49,8 +50,16 @@ namespace {
 
 int markerMargin(MathRow::Element const & e)
 {
-       return e.marker == InsetMath::MARKER
-               || e.marker == InsetMath::MARKER2;
+       switch(e.marker) {
+       case InsetMath::MARKER:
+       case InsetMath::MARKER2:
+       case InsetMath::BOX_MARKER:
+               return 2;
+       case InsetMath::NO_MARKER:
+               return 0;
+       }
+       // should not happen
+       return 0;
 }
 
 
@@ -77,6 +86,7 @@ void afterMetricsMarkers(MetricsInfo const & , MathRow::Element & e,
 
                if (namewid > dim.wid)
                        e.after += namewid - dim.wid;
+               ++dim.asc;
                dim.des += 3 + namedim.height();
        }
 }
@@ -92,9 +102,10 @@ void drawMarkers(PainterInfo const & pi, MathRow::Element const & e,
        Dimension const dim = coords.getInsets().dim(e.inset);
 
        // the marker is before/after the inset. Necessary space has been reserved already.
-       int const l = x + e.before - markerMargin(e);
+       int const l = x + e.before - (markerMargin(e) > 0 ? 1 : 0);
        int const r = x + dim.width() - e.after;
 
+       // Grey lower box
        if (e.marker == InsetMath::BOX_MARKER) {
                // draw header and rectangle around
                FontInfo font;
@@ -105,31 +116,35 @@ void drawMarkers(PainterInfo const & pi, MathRow::Element const & e,
                pi.pain.fillRectangle(l, y + dim.des - namedim.height() - 2,
                                      dim.wid, namedim.height() + 2, Color_mathmacrobg);
                pi.pain.text(l, y + dim.des - namedim.des - 1, e.inset->name(), font);
-               return;
        }
 
-       // Now markers with corners
+       // Color for corners
        bool const highlight = e.inset->mouseHovered(pi.base.bv)
                               || e.inset->editing(pi.base.bv);
        ColorCode const pen_color = highlight ? Color_mathframe : Color_mathcorners;
+       // If the corners have the same color as the background, do not paint them.
+       if (lcolor.getX11Name(Color_mathbg) == lcolor.getX11Name(pen_color))
+               return;
 
+       // Lower corners in all cases
        int const d = y + dim.descent();
        pi.pain.line(l, d - 3, l, d, pen_color);
        pi.pain.line(r, d - 3, r, d, pen_color);
        pi.pain.line(l, d, l + 3, d, pen_color);
        pi.pain.line(r - 3, d, r, d, pen_color);
 
-       if (e.marker == InsetMath::MARKER)
-               return;
-
-       int const a = y - dim.ascent();
-       pi.pain.line(l, a + 3, l, a, pen_color);
-       pi.pain.line(r, a + 3, r, a, pen_color);
-       pi.pain.line(l, a, l + 3, a, pen_color);
-       pi.pain.line(r - 3, a, r, a, pen_color);
+       // Upper corners
+       if (e.marker == InsetMath::BOX_MARKER
+           || e.marker == InsetMath::MARKER2) {
+               int const a = y - dim.ascent();
+               pi.pain.line(l, a + 3, l, a, pen_color);
+               pi.pain.line(r, a + 3, r, a, pen_color);
+               pi.pain.line(l, a, l + 3, a, pen_color);
+               pi.pain.line(r - 3, a, r, a, pen_color);
+       }
 }
 
-}
+} // namespace
 
 
 MathRow::MathRow(MetricsInfo & mi, MathData const * ar)
@@ -219,9 +234,10 @@ int MathRow::after(int i) const
 }
 
 
-void MathRow::metrics(MetricsInfo & mi, Dimension & dim)
+bool MathRow::metrics(MetricsInfo & mi, Dimension & dim)
 {
-       dim.asc = 0;
+       bool has_caret = false;
+
        dim.wid = 0;
        // In order to compute the dimension of macros and their
        // arguments, it is necessary to keep track of them.
@@ -246,8 +262,10 @@ void MathRow::metrics(MetricsInfo & mi, Dimension & dim)
                                d.wid = e.before + e.after;
                                e.inset->beforeMetrics();
                        }
-                       if (e.ar)
+                       if (e.ar) {
                                dim_arrays.push_back(make_pair(e.ar, Dimension()));
+                               has_caret |= e.ar->hasCaret(mi.base.bv);
+                       }
                        break;
                case END:
                        if (e.inset) {
@@ -296,6 +314,7 @@ void MathRow::metrics(MetricsInfo & mi, Dimension & dim)
                dim.wid += mathed_string_width(font, e.compl_text);
        }
        LATTEST(dim_insets.empty() && dim_arrays.empty());
+       return has_caret;
 }
 
 
@@ -362,12 +381,14 @@ void MathRow::draw(PainterInfo & pi, int x, int const y) const
 
                if (!s1.empty()) {
                        f.setColor(Color_inlinecompletion);
-                       pi.pain.text(x, y, s1, f);
+                       // offset the text by e.after to make sure that the
+                       // spacing is after the completion, not before.
+                       pi.pain.text(x - e.after, y, s1, f);
                        x += mathed_string_width(f, s1);
                }
                if (!s2.empty()) {
                        f.setColor(Color_nonunique_inlinecompletion);
-                       pi.pain.text(x, y, s2, f);
+                       pi.pain.text(x - e.after, y, s2, f);
                        x += mathed_string_width(f, s2);
                }
        }