#include "MathRow.h"
-#include "InsetMath.h"
-#include "MathClass.h"
#include "MathData.h"
#include "MathSupport.h"
#include "BufferView.h"
+#include "ColorSet.h"
#include "CoordCache.h"
#include "MetricsInfo.h"
+#include "mathed/InsetMath.h"
+
#include "frontends/FontMetrics.h"
#include "frontends/Painter.h"
MathRow::Element::Element(MetricsInfo const & mi, Type t, MathClass mc)
: type(t), mclass(mc), before(0), after(0), macro_nesting(mi.base.macro_nesting),
- marker(InsetMath::NO_MARKER), inset(0), compl_unique_to(0), ar(0),
+ marker(marker_type::NO_MARKER), inset(nullptr), compl_unique_to(0), ar(nullptr),
color(Color_red)
{}
+namespace {
+
+// Helper functions for markers
+
+int markerMargin(MathRow::Element const & e)
+{
+ switch(e.marker) {
+ case marker_type::MARKER:
+ case marker_type::MARKER2:
+ case marker_type::BOX_MARKER:
+ return 2;
+ case marker_type::NO_MARKER:
+ return 0;
+ }
+ // should not happen
+ return 0;
+}
+
+
+void afterMetricsMarkers(MetricsInfo const & , MathRow::Element & e,
+ Dimension & dim)
+{
+ // handle vertical space for markers
+ switch(e.marker) {
+ case marker_type::NO_MARKER:
+ break;
+ case marker_type::MARKER:
+ ++dim.des;
+ break;
+ case marker_type::MARKER2:
+ ++dim.asc;
+ ++dim.des;
+ break;
+ case marker_type::BOX_MARKER:
+ FontInfo font;
+ font.setSize(TINY_SIZE);
+ Dimension namedim;
+ mathed_string_dim(font, e.inset->name(), namedim);
+ int const namewid = 1 + namedim.wid + 1;
+
+ if (namewid > dim.wid)
+ e.after += namewid - dim.wid;
+ ++dim.asc;
+ dim.des += 3 + namedim.height();
+ }
+}
+
+
+void drawMarkers(PainterInfo const & pi, MathRow::Element const & e,
+ int const x, int const y)
+{
+ if (e.marker == marker_type::NO_MARKER)
+ return;
+
+ CoordCache const & coords = pi.base.bv->coordCache();
+ 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) > 0 ? 1 : 0);
+ int const r = x + dim.width() - e.after;
+
+ // Grey lower box
+ if (e.marker == marker_type::BOX_MARKER) {
+ // draw header and rectangle around
+ FontInfo font;
+ font.setSize(TINY_SIZE);
+ font.setColor(Color_mathmacrolabel);
+ Dimension namedim;
+ mathed_string_dim(font, e.inset->name(), namedim);
+ 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);
+ }
+
+ // 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.getX11HexName(Color_mathbg) == lcolor.getX11HexName(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);
+
+ // Upper corners
+ if (e.marker == marker_type::BOX_MARKER
+ || e.marker == marker_type::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)
{
// First there is a dummy element of type "open"
}
// finally reserve space for markers
- if (bef.marker != InsetMath::NO_MARKER)
- bef.after = max(bef.after, 1);
- if (e.mclass != MC_UNKNOWN && e.marker != InsetMath::NO_MARKER)
- e.before = max(e.before, 1);
+ bef.after = max(bef.after, markerMargin(bef));
+ if (e.mclass != MC_UNKNOWN)
+ e.before = max(e.before, markerMargin(e));
// for linearized insets (macros...) too
- if (e.type == BEGIN && e.marker != InsetMath::NO_MARKER)
- bef.after = max(bef.after, 1);
- if (e.type == END && e.marker != InsetMath::NO_MARKER) {
+ if (e.type == BEGIN)
+ bef.after = max(bef.after, markerMargin(e));
+ if (e.type == END && e.marker != marker_type::NO_MARKER) {
Element & aft = elements_[after(i)];
- aft.before = max(aft.before, 1);
+ aft.before = max(aft.before, markerMargin(e));
}
}
}
-namespace {
-
-void afterMetricsMarkers(MetricsInfo const & mi, MathRow::Element & e,
- Dimension & dim)
-{
- // handle vertical space for markers
- switch(e.marker) {
- case InsetMath::NO_MARKER:
- break;
- case InsetMath::MARKER:
- ++dim.des;
- break;
- case InsetMath::MARKER2:
- ++dim.asc;
- ++dim.des;
- break;
- case InsetMath::BOX_MARKER:
- FontInfo font = mi.base.font;
- augmentFont(font, "lyxtex");
- font.setSize(FONT_SIZE_TINY);
- Dimension namedim;
- mathed_string_dim(font, e.inset->name(), namedim);
- int const namewid = 1 + namedim.wid + 1;
- dim.wid += 2;
- if (namewid > dim.wid)
- e.after += namewid - dim.wid;
- dim.asc += 2;
- dim.des += 2 + namedim.height();
- }
-}
-
-}
-
-
void MathRow::metrics(MetricsInfo & mi, Dimension & dim)
{
- dim.asc = 0;
dim.wid = 0;
// In order to compute the dimension of macros and their
// arguments, it is necessary to keep track of them.
}
-namespace {
-
-void drawMarkers(PainterInfo const & pi, MathRow::Element const & e, int const x, int const y)
-{
- if (e.marker == InsetMath::NO_MARKER)
- return;
-
- CoordCache const & coords = pi.base.bv->coordCache();
- Dimension const dim = coords.getInsets().dim(e.inset);
-
- // the marker is before/after the inset. Normally some space has been reserved already.
- int const l = x + e.before - 1;
- int const r = x + dim.width() - e.after;
-
- if (e.marker == InsetMath::BOX_MARKER) {
- // draw header and rectangle around
- FontInfo font = pi.base.font;
- augmentFont(font, "lyxtex");
- font.setSize(FONT_SIZE_TINY);
- font.setColor(Color_mathmacrolabel);
- Dimension namedim;
- mathed_string_dim(font, e.inset->name(), namedim);
- pi.pain.rectangle(l, y - dim.asc, dim.wid,
- dim.height(), Color_mathmacroframe);
- pi.pain.fillRectangle(l, y + dim.des - namedim.height() - 2,
- dim.wid, namedim.height() + 2, Color_mathmacrobg);
- pi.pain.text(l + 1, y + dim.des - namedim.des - 1, e.inset->name(), font);
- return;
- }
-
- // Duplicated from Inset.cpp and adapted. It is believed that the
- // Inset version should die eventually
- ColorCode pen_color = e.inset->mouseHovered(pi.base.bv) || e.inset->editing(pi.base.bv)?
- Color_mathframe : Color_mathcorners;
-
- 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);
-}
-
-}
-
void MathRow::draw(PainterInfo & pi, int x, int const y) const
{
CoordCache & coords = pi.base.bv->coordCache();
// This is hackish: the math inset does not know that space
// has been added before and after it; we alter its dimension
// while it is drawing, because it relies on this value.
- Dimension const d = coords.insets().dim(e.inset);
- Dimension d2 = d;
- d2.wid -= e.before + e.after;
- coords.insets().add(e.inset, d2);
- e.inset->drawSelection(pi, x + e.before, y);
+ Geometry & g = coords.insets().geometry(e.inset);
+ g.dim.wid -= e.before + e.after;
+ if (pi.pain.develMode() && !e.inset->isBufferValid())
+ pi.pain.fillRectangle(x + e.before, y - g.dim.ascent(),
+ g.dim.width(), g.dim.height(), Color_error);
e.inset->draw(pi, x + e.before, y);
- coords.insets().add(e.inset, x, y);
- coords.insets().add(e.inset, d);
+ g.pos = {x, y};
+ g.dim.wid += e.before + e.after;
drawMarkers(pi, e, x, y);
- x += d.wid;
+ x += g.dim.wid;
break;
}
case BEGIN:
+ if (e.ar) {
+ coords.arrays().add(e.ar, x, y);
+ e.ar->drawSelection(pi, x, y);
+ }
if (e.inset) {
coords.insets().add(e.inset, x, y);
drawMarkers(pi, e, x, y);
e.inset->beforeDraw(pi);
}
x += e.before + e.after;
- if (e.ar)
- coords.arrays().add(e.ar, x, y);
break;
case END:
if (e.inset)
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);
}
}
projects / features.git / blobdiff