From bf165c04de8345f1cf9b0252bfa996103009055a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Mon, 19 Aug 2002 14:39:35 +0000 Subject: [PATCH] - re-enable editing of macro name during input - fix drawing glitch (font sizes in macro definitions) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5024 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/mathed/formulamacro.C | 18 ++++++++++-------- src/mathed/math_cursor.C | 8 ++++++++ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C index 4309703663..7c759d3432 100644 --- a/src/mathed/formulamacro.C +++ b/src/mathed/formulamacro.C @@ -170,29 +170,31 @@ Inset::Code InsetFormulaMacro::lyxCode() const void InsetFormulaMacro::draw(BufferView * bv, LyXFont const & f, int y, float & xx, bool /*cleared*/) const { - MathPainterInfo pain = MathPainterInfo(bv->painter()); - LyXFont font(f); - // label + LyXFont font(f); font.setColor(LColor::math); + MathPainterInfo pi = MathPainterInfo(bv->painter()); + pi.base.style = LM_ST_TEXT; + pi.base.font = font; + int const x = int(xx); int const a = y - ascent(bv, font) + 1; int const w = width(bv, font) - 2; int const h = ascent(bv, font) + descent(bv, font) - 2; // LColor::mathbg used to be "AntiqueWhite" but is "linen" now, too - pain.pain.fillRectangle(x, a, w, h, LColor::mathmacrobg); - pain.pain.rectangle(x, a, w, h, LColor::mathframe); + pi.pain.fillRectangle(x, a, w, h, LColor::mathmacrobg); + pi.pain.rectangle(x, a, w, h, LColor::mathframe); if (mathcursor && const_cast(mathcursor->formula()) == this) - mathcursor->drawSelection(pain); + mathcursor->drawSelection(pi); - pain.pain.text(x + 2, y, prefix(), font); + pi.pain.text(x + 2, y, prefix(), font); // formula - par()->draw(pain, x + font_metrics::width(prefix(), f) + 5, y); + par()->draw(pi, x + font_metrics::width(prefix(), f) + 5, y); xx += w + 2; xo_ = x; yo_ = y; diff --git a/src/mathed/math_cursor.C b/src/mathed/math_cursor.C index 0537a8128c..df7444f328 100644 --- a/src/mathed/math_cursor.C +++ b/src/mathed/math_cursor.C @@ -432,6 +432,14 @@ void MathCursor::backspace() return; } + if (inMacroMode()) { + MathUnknownInset * p = activeMacro(); + if (p->name().size() > 1) { + p->setName(p->name().substr(0, p->name().size() - 1)); + return; + } + } + /* if (prevAtom()->asScriptInset()) { // simply enter nucleus