* LyX, The Document Processor
*
* Copyright 1995 Matthias Ettrich
- * Copyright 1995-1999 The LyX Team.
+ * Copyright 1995-2000 The LyX Team.
*
* ====================================================== */
#include "debug.h"
#include "Painter.h"
+using std::ostream;
+using std::endl;
+
+
InsetCommand::InsetCommand()
{
}
int InsetCommand::ascent(Painter & pain, LyXFont const &) const
{
-#if 1
LyXFont font(LyXFont::ALL_SANE);
font.decSize();
false, width, ascent, descent);
}
return ascent;
-#else
- LyXFont f = font;
- f.decSize();
- return f.maxAscent() + 3;
-#endif
}
int InsetCommand::descent(Painter & pain, LyXFont const &) const
{
-#if 1
LyXFont font(LyXFont::ALL_SANE);
font.decSize();
false, width, ascent, descent);
}
return descent;
-#else
- LyXFont f = font;
- f.decSize();
- return f.maxDescent() + 3;
-#endif
}
int InsetCommand::width(Painter & pain, LyXFont const &) const
{
-#if 1
LyXFont font(LyXFont::ALL_SANE);
font.decSize();
LColor::commandbg, LColor::commandframe,
false, width, ascent, descent);
}
- return width;
-#else
- LyXFont f = font;
- f.decSize();
- string s = getScreenLabel();
- return 10 + f.stringWidth(s);
-#endif
+ return width + 4;
}
int baseline, float & x) const
{
// Draw it as a box with the LaTeX text
-#if 1
LyXFont font(LyXFont::ALL_SANE);
font.setColor(LColor::command).decSize();
string s = getScreenLabel();
if (Editable()) {
- pain.buttonText(int(x), baseline, s, font, true, width);
+ pain.buttonText(int(x)+2, baseline, s, font, true, width);
} else {
- pain.rectText(int(x), baseline, s, font,
+ pain.rectText(int(x)+2, baseline, s, font,
LColor::commandbg, LColor::commandframe,
true, width);
}
- x += width;
-#else
-
- x += 3;
-
- pain.fillRectangle(int(x), baseline - ascent(pain, font) + 1,
- width(pain, font) - 6,
- ascent(pain, font) + descent(pain, font) - 2,
- LColor::insetbg);
- // Tell whether this slows down the drawing (ale)
- // lets draw editable and non-editable insets differently
- if (Editable()) {
- int y = baseline - ascent(pain, font) + 1;
- int w = width(pain, font) - 6;
- int h = ascent(pain, font) + descent(pain, font) - 2;
- pain.rectangle(int(x), y, w, h, LColor::insetframe);
- } else {
-
- pain.rectangle(int(x), baseline - ascent(pain, font) + 1,
- width(pain, font) - 6,
- ascent(pain, font) + descent(pain, font) - 2,
- LColor::insetframe);
- }
- string s = getScreenLabel();
- LyXFont f(font);
- f.decSize();
- f.setColor(LColor::none);
- f.setLatex(LyXFont::OFF);
- pain.text(int(x + 2), baseline, s, f);
-
- x += width(pain, font) - 3;
-#endif
+ x += width + 4;
}
}
-int InsetCommand::Latex(ostream & os, signed char /*fragile*/, bool/*fs*/) const
+int InsetCommand::Latex(ostream & os, bool /*fragile*/, bool/*fs*/) const
{
os << getCommand();
return 0;
}
+int InsetCommand::Ascii(ostream &) const
+{
+ return 0;
+}
+
+
int InsetCommand::Linuxdoc(ostream &) const
{
return 0;