anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 10:18:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

- re-enable editing of macro name during input

Browse Source 
- 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
This commit is contained in:
André Pönitz 2002-08-19 14:39:35 +00:00
parent 11ffa04773
commit bf165c04de
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/mathed/formulamacro.C
View File

@ -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<InsetFormulaBase const *>(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;

8
src/mathed/math_cursor.C
View File

@ -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