Scrap LColor mathcursor. Use only logical colours in mathed.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6801 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2003-04-14 16:00:42 +00:00
parent dff84ad50d
commit 47003fdee1
6 changed files with 9 additions and 6 deletions

View File

@ -1,3 +1,7 @@
2003-04-14 Angus Leeming <leeming@lyx.org>
* LColor.[Ch]: scrap LColor mathcursor.
2003-04-14 Lars Gullik Bjønnes <larsbj@gullik.net> 2003-04-14 Lars Gullik Bjønnes <larsbj@gullik.net>
* lyxlex.[Ch] (text): delete function * lyxlex.[Ch] (text): delete function

View File

@ -70,7 +70,6 @@ LColor::LColor()
{ graphicsbg, N_("graphics background"), "graphicsbg", "linen", "graphicsbg" }, { graphicsbg, N_("graphics background"), "graphicsbg", "linen", "graphicsbg" },
{ mathmacrobg, N_("Math macro background"), "mathmacrobg", "linen", "mathmacrobg" }, { mathmacrobg, N_("Math macro background"), "mathmacrobg", "linen", "mathmacrobg" },
{ mathframe, N_("math frame"), "mathframe", "Magenta", "mathframe" }, { mathframe, N_("math frame"), "mathframe", "Magenta", "mathframe" },
{ mathcursor, N_("math cursor"), "mathcursor", "black", "mathcursor" },
{ mathline, N_("math line"), "mathline", "Blue", "mathline" }, { mathline, N_("math line"), "mathline", "Blue", "mathline" },
{ captionframe, N_("caption frame"), "captionframe", "DarkRed", "captionframe" }, { captionframe, N_("caption frame"), "captionframe", "DarkRed", "captionframe" },
{ collapsable, N_("collapsable inset text"), "collapsable", "DarkRed", "collapsable" }, { collapsable, N_("collapsable inset text"), "collapsable", "DarkRed", "collapsable" },

View File

@ -107,8 +107,6 @@ public:
mathmacrobg, mathmacrobg,
/// Math inset frame color /// Math inset frame color
mathframe, mathframe,
/// Math cursor color
mathcursor,
/// Math line color /// Math line color
mathline, mathline,

View File

@ -2,6 +2,8 @@
* math_fboxinset.C: * math_fboxinset.C:
* math_frameboxinset.C: s/\(LColor::\)black/\1foreground/ * math_frameboxinset.C: s/\(LColor::\)black/\1foreground/
* math_macrotemplate.C: s/\(LColor::\)blue/\1mathline/
* math_support.C: s/\(LColor::\)mathcursor/\1cursor/
2003-04-02 John Levon <levon@movementarian.org> 2003-04-02 John Levon <levon@movementarian.org>

View File

@ -78,10 +78,10 @@ void MathMacroTemplate::draw(PainterInfo & pi, int x, int y) const
int const w1 = cell(1).width(); int const w1 = cell(1).width();
cell(0).draw(pi, x + 2, y + 1); cell(0).draw(pi, x + 2, y + 1);
pi.pain.rectangle(x, y - ascent() + 1, w0 + 4, height(), pi.pain.rectangle(x, y - ascent() + 1, w0 + 4, height(),
LColor::blue); LColor::mathline);
cell(1).draw(pi, x + 8 + w0, y + 1); cell(1).draw(pi, x + 8 + w0, y + 1);
pi.pain.rectangle(x + w0 + 6 , y - ascent() + 1, w1 + 4, pi.pain.rectangle(x + w0 + 6 , y - ascent() + 1, w1 + 4,
height(), LColor::blue); height(), LColor::mathline);
} }

View File

@ -400,7 +400,7 @@ void mathed_draw_deco(PainterInfo & pi, int x, int y, int w, int h,
{ {
if (name == ".") { if (name == ".") {
pi.pain.line(x + w/2, y, x + w/2, y + h, pi.pain.line(x + w/2, y, x + w/2, y + h,
LColor::mathcursor, Painter::line_onoffdash); LColor::cursor, Painter::line_onoffdash);
return; return;
} }